update firefox repository

5 files changed, 37 insertions, 107 deletions

diff --git a/auto/config b/auto/config
index c0978d5..ce2862c 100755
--- a/auto/config
+++ b/auto/config
@@ -49,21 +49,21 @@ lb config noauto \
 
 # architecture and distribution depending stuff (e.g. kernel)
 case "$LB_DISTRIBUTION" in
-squeeze)
-	LB_REPOSITORIES+=" firefox wine-ppa squeeze-backports hellfire acritox"
+wheezy)
+	LB_REPOSITORIES+=" dragonfire fds-team-wheezy fds-team-source dragonfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
 	esac
 	;;
-wheezy)
-	LB_REPOSITORIES+=" dragonfire fds-team-wheezy fds-team-source dragonfire-acritox"
+jessie)
+    LB_REPOSITORIES+=" dragonfire spitfire fds-team-debian fds-team-source spitfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
 	esac
 	;;
-jessie|*)
+*)
     LB_REPOSITORIES+=" dragonfire spitfire fds-team-debian fds-team-source spitfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
@@ -101,7 +101,7 @@ if grep -wq wine-staging <<<"$LB_PACKAGES $LB_PACKAGES_LISTS"; then
     fi
 fi
 grep -wq iceweasel <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" iceweasel"
-grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox-wheezy"
+grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox"
 grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight"
 grep -wq spotify <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" spotify"
 grep -wq dropbox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" dropbox"
diff --git a/config/repositories/firefox b/config/repositories/firefox
index 7ff38b9..29feb03 100644
--- a/config/repositories/firefox
+++ b/config/repositories/firefox
@@ -1,3 +1,3 @@
-# Firefox
-deb http://mozilla.debian.net/ squeeze-backports iceweasel-release
-deb-src http://mozilla.debian.net/ squeeze-backports iceweasel-release
+# mozilla.debian.net
+deb http://mozilla.debian.net/ @DISTRIBUTION@-backports iceweasel-release
+deb-src http://mozilla.debian.net/ @DISTRIBUTION@-backports iceweasel-release
diff --git a/config/repositories/firefox-wheezy b/config/repositories/firefox-wheezy
deleted file mode 100644
index 98a22c6..0000000
--- a/config/repositories/firefox-wheezy
+++ /dev/null
@@ -1,3 +0,0 @@
-# mozilla.debian.net
-deb http://mozilla.debian.net/ wheezy-backports iceweasel-release
-deb-src http://mozilla.debian.net/ wheezy-backports iceweasel-release
diff --git a/config/repositories/firefox-wheezy.gpg b/config/repositories/firefox-wheezy.gpg
deleted file mode 100644
index 6e183ca..0000000
--- a/config/repositories/firefox-wheezy.gpg
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-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
-sOl6WgCYzXHdullu24QI3oC8p7MXbcol8g==
-=hjHb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/firefox.gpg b/config/repositories/firefox.gpg
index ea954c6..6e183ca 100644
--- a/config/repositories/firefox.gpg
+++ b/config/repositories/firefox.gpg
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.12 (GNU/Linux)
 
 mQINBEznsdMBEACfcYngEYj3ybsPxPuuzujmYs1oWFLSm9lm1dAHw0bBMhBxgBwf
 HaSxh/Z43oX0+i0Qz37gU/rY+zW5nMMvBtF+0L0ZmX43SqxxX7vK4mPxN5h6KvUC
@@ -13,55 +13,31 @@ CVJx8T/Urj+qQ4VkQKPzlAtVGC3EqD77afyjLfAHPVcnzhZqcwwiKUmZBI+jgZC/
 edeO2ZYamOL83b7RDjUxNGqxQLbzgTER/CqJp4FcdAwRQZ4kkjOZ++oCKazEVNwh
 bgl5et0jGxiLYvqZYkVjyGCeNbZalR/nh7QiGfWQ0HKh8+rCJPnMQxUnXQARAQAB
 tFFEZWJpYW4gTW96aWxsYSB0ZWFtIEFQVCBhcmNoaXZlIDxwa2ctbW96aWxsYS1t
-YWludGFpbmVyc0BsaXN0cy5hbGlvdGguZGViaWFuLm9yZz6IRQQQEQgABgUCTOey
-+wAKCRDeS9osVP0qWGc+AJ9tuSy5Haz6PYJkXZbaRX3CsOl6WgCYzXHdullu24QI
-3oC8p7MXbcol8okCHAQQAQgABgUCTOey3AAKCRDkKqBPpqqMcrCbD/0Y3mYRQK88
-4qR+F0WIIrDPYyYcfax7oGrW2M+CVbAkNh+18UTncvXLCppKMj3ltKotOlO99XVC
-a4vOTo3+Ok6r6BpZ06d1g1f7QHcMGyqQCTeBHVj80mDCLkuSwAhI8qWIrN1cXi4W
-f7EAeYGFPbKa+j866ckpDMAxJTBVZDvwAvjLTnyeok2HY0roN94b5vX+dCZkVcKI
-5VPVKTaZXJ1qPBbHXTXGEbeGpOnZgTOu/E5XRhuQPqq1movyIj5HBKwAsAsjcL/Z
-BESOUWQeE3yGefzvbD0QOqmj9dJMiGakeGN8s8EhoFO8jUkpOqwQAfdQOMBwBPVb
-jChaIeLyfFJzIKcV4k5xxQdRMUnQHPzVV4WOL2mstJxNF4jYxZz2W6ZIiPRo5l6+
-7FuvaOZjQxz2oimpxJTFsx43lRhR8+rmdutirxAuBqm78ZM8bXxcXjmNqJ7x5sIA
-xsh9kyFvTBq6dNbH7l8bFTe/LJgnc5Rb/1Wi+7nJPu9Yzdm0Vrapm0v5c7jZ1KMH
-r94thQzz2ZAvuzh0J9IuVuNKo60wtpDPlAPw+JzE6bJqsbkrCYqJWbI9zagsAXEA
-rPBsLp+xPTAYzllJhDwB0pjOvRssJe02o01w69HScEyYJLnlJcLt9IfKRGymgU7p
-gKr44YPuPIVhJZfEO1q60Y4lq/q+yxcVuokCPQQTAQgAJwIbAwULCQgHAwUVCgkI
-CwUWAgMBAAIeAQIXgAUCTsI9OAUJA7u+4gAKCRCFo9JlBsSuKpvQD/92BZt8KZ6Y
-huu6AUjAmkYiDEPx8YWLaQJPERzGhtWo4eoTCj3+9GgwpvTYzRHnVAzVitqxgNlh
-mrKRdqmZJMbGG8iWhCbKge+if/JnAy2yoj6FNDjwY5gVcHqcM2RuNCYxDi0x2fmE                                                                                                                    
-U+8hr1mZIBYJHZPbIo9V0KkurQotzVTf22Pt1PJwcyPdVUeczW/+F/TspXlQvxmD                                                                                                                    
-91v9ly1MJYKCcyigoSHf+fV79RQh35bCKVSW7QTgiveA5g3Y561v4CSME2PHu+wc                                                                                                                    
-v8Pag/ZvKIptMWzw7J9hXBEUazknFdrIkClaZPskhZswQh0AFF8WW952/8BpjXSN                                                                                                                    
-FtzcUMAd/C8O+ldOJ8xEPuf78DOPbysl5PwMmWrUmCylkvHmUs6v9Xr8xBu5PCMg                                                                                                                    
-sgrGqhz65HBlZUB4OpvowCa5y3h6rx9GJAE1IzNXaUslaPxedPiE9PnFPuVeBgGm                                                                                                                    
-xZlCengp/ciMputDR4toNdHdEAxz4gYtpNUphB1fL61mpwliRHCcljvmYrav8+bP
-7D4JwccaS29x5PTX3yuKPnq+CW5w6W+ihNEh4v4nceEVZNWKYZjctzvo3Lu4H1kG
-A6FEoV+1Fo0nOUqbOjrrX9Fcjw9Xa4x0sFEGzI/LbBNVPAEeIzTV88UlrolQT+Pl
-wg72YCtzV9j96Vn3D9NGvvhn5M+Z4Bhmj4kCPQQTAQgAJwIbAwULCQgHAwUVCgkI
-CwUWAgMBAAIeAQIXgAUCUKOZxwUJEORQcQAKCRCFo9JlBsSuKhs3D/9iU1gyyw1Z
-XQsN6o19fGsm3x/T4uoZPNyctDcbel94ocsdMvXPYex5wx07YZJA2K4I8ztj7KRw
-Ow0mSqUFuY3cQwt148BLwHBuGYCYQWroeO/jYZMb1nQc985+n+/FAaN8DPcfUbg9
-4Vpc+8Fhk2Vm/xFuBY/VqL8W2do18/a28igDlg72Kur7SrfcbCAzq6wUXHHm10mK
-vWaM0Or3U3jvQdLzuF1CUFvk+BLEetUvQPupIUyhJgSFUw41eOuq+dIQAUPhZ2qS
-j6DHhgZFGxGRg1p1X7AmGa1KYGFtSbfEx1+ZzRVCcpnky+ouWw5x8n4FlRQMKJck
-veXvBl2JeUBuOYbfp2nnHlNQqgnZYGaPvW8l4Pz1oU66hCsTC2wft62trR5p++KT
-q3/WJgWo/WKb/9xa3I+Gg/j2YYsZY/aIgDLJn9WH6VmPohoRUp5lMv9kmTvhWdnH
-qKusJ+mrmxIdNqQhdd7fOiNsXpvdM2ASy01NJ9cwtZk7p+OHgbbY1CC3PmCUq4BN
-oka1t7339h+35f7/EnkxJBaXzGohXBY1/7yo95zD1bG4Z/MwzO0x59G9RAJjZJ1v
-a537PKw56UkpMcVA2Ylp/ukHnpHeifnVqL2e3vPc4aKrtQrLAGeTRFRAua77Oz/W
-RqBNK4Byts10r44CaEmUNqXlYogSlUhOH4kCPQQTAQgAJwUCTOex0wIbAwUJAeEz
-gAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCFo9JlBsSuKqLsEACDk2seO4IR
-g0nOANHz/qlBvF57RRYuHKvrIjlGZp/SKTmEaDevwtYtG9RNMi+OxlzPmxxmH3He
-gDSKpBna24mfsBFZcmI1qGEz9xqo+gP25IRcK0DalZT357WgthBTYBGYVpjRn5Oq
-z3uH/vA7k9vtFhPXzU5rn02Z2w+JnwjQDibTCBDshKSWdTG8ZQ8Kb72J3GU7f8rL
-DX6J9hamMkn0Iy3VD6pFSdkHAHJZAMmE8wfqKsIMXQty2IFmp67fTldP8WpGucG4
-owRiybbudnmr2Gyx/yvj8WDmshxRAj6s4BLomeBFtsrnNNarHRXXURy0XwB7qOM0
-ARksgmqKDF99zGsnal4CxeqLRfwi8bb1RwwGNJiYelV8B99jt5LfJZxaMeP4LqPy
-STn2QPAsyL48tLauSb+Owqxt+JoZ9qfKO69t0mCskp6KEe8jcD7iA5iZKZJW8qzm
-f9dS21JjYmZqq2oGDnNo7/rmLQAJe7q0wUjf5Pol7+tYne9I/SAevmB9qBik+tLW
-KRKeypOdvjV91sliCx2rm+YfTIfsyzqaAvWh4xA1YNjC39m7JIfcmCcy5achiihK
-nRqBd/hokNDPAyV/+fCyO/7PxSbvdCMVM8I+hTkIjk4NmHw0uKMxYkKoBM9XSzpC
-5dEKsTdQ0vU/+HHrC19wtWAFLln9juSSKw==
-=YhuA
+YWludGFpbmVyc0BsaXN0cy5hbGlvdGguZGViaWFuLm9yZz6JAj0EEwEIACcCGwMF
+CwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlCjmccFCRDkUHEACgkQhaPSZQbEriob
+Nw//YlNYMssNWV0LDeqNfXxrJt8f0+LqGTzcnLQ3G3pfeKHLHTL1z2HsecMdO2GS
+QNiuCPM7Y+ykcDsNJkqlBbmN3EMLdePAS8BwbhmAmEFq6Hjv42GTG9Z0HPfOfp/v
+xQGjfAz3H1G4PeFaXPvBYZNlZv8RbgWP1ai/FtnaNfP2tvIoA5YO9irq+0q33Gwg
+M6usFFxx5tdJir1mjNDq91N470HS87hdQlBb5PgSxHrVL0D7qSFMoSYEhVMONXjr
+qvnSEAFD4Wdqko+gx4YGRRsRkYNadV+wJhmtSmBhbUm3xMdfmc0VQnKZ5MvqLlsO
+cfJ+BZUUDCiXJL3l7wZdiXlAbjmG36dp5x5TUKoJ2WBmj71vJeD89aFOuoQrEwts
+H7etra0eafvik6t/1iYFqP1im//cWtyPhoP49mGLGWP2iIAyyZ/Vh+lZj6IaEVKe
+ZTL/ZJk74VnZx6irrCfpq5sSHTakIXXe3zojbF6b3TNgEstNTSfXMLWZO6fjh4G2
+2NQgtz5glKuATaJGtbe99/Yft+X+/xJ5MSQWl8xqIVwWNf+8qPecw9WxuGfzMMzt
+MefRvUQCY2Sdb2ud+zysOelJKTHFQNmJaf7pB56R3on51ai9nt7z3OGiq7UKywBn
+k0RUQLmu+zs/1kagTSuAcrbNdK+OAmhJlDal5WKIEpVITh+JAhwEEAEIAAYFAkzn
+stwACgkQ5CqgT6aqjHKwmw/9GN5mEUCvPOKkfhdFiCKwz2MmHH2se6Bq1tjPglWw
+JDYftfFE53L1ywqaSjI95bSqLTpTvfV1QmuLzk6N/jpOq+gaWdOndYNX+0B3DBsq
+kAk3gR1Y/NJgwi5LksAISPKliKzdXF4uFn+xAHmBhT2ymvo/OunJKQzAMSUwVWQ7
+8AL4y058nqJNh2NK6DfeG+b1/nQmZFXCiOVT1Sk2mVydajwWx101xhG3hqTp2YEz
+rvxOV0YbkD6qtZqL8iI+RwSsALALI3C/2QREjlFkHhN8hnn872w9EDqpo/XSTIhm
+pHhjfLPBIaBTvI1JKTqsEAH3UDjAcAT1W4woWiHi8nxScyCnFeJOccUHUTFJ0Bz8
+1VeFji9prLScTReI2MWc9lumSIj0aOZevuxbr2jmY0Mc9qIpqcSUxbMeN5UYUfPq
+5nbrYq8QLgapu/GTPG18XF45jaie8ebCAMbIfZMhb0waunTWx+5fGxU3vyyYJ3OU
+W/9Vovu5yT7vWM3ZtFa2qZtL+XO42dSjB6/eLYUM89mQL7s4dCfSLlbjSqOtMLaQ
+z5QD8PicxOmyarG5KwmKiVmyPc2oLAFxAKzwbC6fsT0wGM5ZSYQ8AdKYzr0bLCXt
+NqNNcOvR0nBMmCS55SXC7fSHykRspoFO6YCq+OGD7jyFYSWXxDtautGOJav6vssX
+FbqIRQQQEQgABgUCTOey+wAKCRDeS9osVP0qWGc+AJ9tuSy5Haz6PYJkXZbaRX3C
+sOl6WgCYzXHdullu24QI3oC8p7MXbcol8g==
+=hjHb
 -----END PGP PUBLIC KEY BLOCK-----