Merge branch 'master' of git.fsmpi.rwth-aachen.de:osak/lipck

contrib/rootfs/offline_repo.json

@@ -94,21 +94,21 @@
             "tagged": true
         },
         {
-            "pkgname": "linux-image-4.3.0-040300rc5-generic",
+            "pkgname": "linux-image-4.6.0-040600rc1-generic",
             "pkgdescription": "Vanilla Linux Kernel",
             "tagged": false,
             "urls": [
-              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.3-rc5-unstable/linux-image-4.3.0-040300rc5-generic_4.3.0-040300rc5.201510111530_amd64.deb",
-              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.3-rc5-unstable/linux-image-4.3.0-040300rc5-generic_4.3.0-040300rc5.201510111530_i386.deb"
+              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.6-rc1-wily/linux-image-4.6.0-040600rc1-generic_4.6.0-040600rc1.201603261930_amd64.deb",
+              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.6-rc1-wily/linux-image-4.6.0-040600rc1-generic_4.6.0-040600rc1.201603261930_i386.deb"
             ]
         },
         {
-            "pkgname": "linux-headers-4.3.0-040300rc5-generic",
+            "pkgname": "linux-headers-4.6.0-040600rc1-generic",
             "pkgdescription": "Vanilla Linux Kernel Headers",
             "tagged": false,
             "urls": [
-              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.3-rc5-unstable/linux-headers-4.3.0-040300rc5-generic_4.3.0-040300rc5.201510111530_amd64.deb",
-              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.3-rc5-unstable/linux-headers-4.3.0-040300rc5-generic_4.3.0-040300rc5.201510111530_i386.deb"
+              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.6-rc1-wily/linux-headers-4.6.0-040600rc1-generic_4.6.0-040600rc1.201603261930_amd64.deb",
+              "http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.6-rc1-wily/linux-headers-4.6.0-040600rc1-generic_4.6.0-040600rc1.201603261930_i386.deb"
             ]
         }
       ]
@@ -121,16 +121,16 @@
             "tagged": true,
             "hidden": true,
             "urls": [
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.2+ds-1+b1_amd64.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.2+ds-1+b1_i386.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.2+ds-1+b1_amd64.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.2+ds-1+b1_i386.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-data_4.0.2+ds-1_all.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.2+ds-1+b1_amd64.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.2+ds-1+b1_i386.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-doc_4.0.2+ds-1_all.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.2+ds-1+b1_amd64.deb",
-              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.2+ds-1+b1_i386.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.3+ds-1_amd64.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.3+ds-1_i386.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.3+ds-1_amd64.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.3+ds-1_i386.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-data_4.0.3+ds-1_all.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.3+ds-1_amd64.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.3+ds-1_i386.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-doc_4.0.3+ds-1_all.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.3+ds-1_amd64.deb",
+              "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.3+ds-1_i386.deb",
               "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/f/flint/libflint-2.5.2_2.5.2-3_amd64.deb",
               "ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/f/flint/libflint-2.5.2_2.5.2-3_i386.deb"
             ]

patches/iso/casper-remove-needed-packages-from-unistall-manifest.patch

---- a/casper/filesystem.manifest-remove	2015-10-17 15:27:56.802304069 +0200
-+++ b/casper/filesystem.manifest-remove	2015-10-17 15:27:29.508085138 +0200
-@@ -44,8 +44,6 @@
+--- a/casper/filesystem.manifest-remove
++++ b/casper/filesystem.manifest-remove
+@@ -45,8 +45,6 @@ libfcitx-gclient0:amd64
  libfcitx-qt0:amd64
  libfcitx-qt5-1:amd64
  libfcitx-utils0:amd64
 -libgeoclue0:amd64
--libjavascriptcoregtk-3.0-0:amd64
+-libjavascriptcoregtk-4.0-18:amd64
  liblua5.2-0:amd64
+ liblvm2app2.2:amd64
  liblvm2cmd2.02:amd64
- libnss3-1d:amd64
-@@ -53,10 +51,7 @@
- libpresage1:amd64
+@@ -55,10 +53,7 @@ libpresage-data
+ libpresage1v5:amd64
  libreadline5:amd64
  libtinyxml2.6.2v5:amd64
--libwebkitgtk-3.0-0:amd64
--libwebkitgtk-3.0-common
+-libwebkit2gtk-4.0-37:amd64
+-libwebkit2gtk-4.0-37-gtk2:amd64
  linux-signed-generic
--linux-signed-image-4.2.0-16-generic
+-linux-signed-image-4.4.0-16-generic
  linux-signed-image-generic
  localechooser-data
  lupin-casper
-@@ -84,5 +80,3 @@
+@@ -86,5 +81,3 @@ ubiquity-slideshow-kubuntu
+ ubiquity-ubuntu-artwork
  user-setup
- watershed
  xfsprogs
 -zenity
 -zenity-common