From: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu, 14 Aug 2014 15:52:38 +0000 (-0400)
Subject: build guest additions only for neurodebian wheezy
X-Git-Url: https://git.donarmstrong.com/?p=neurodebian.git;a=commitdiff_plain;h=4bfddcd6315ac01a3d57bc8fe95c55a737a904a1

build guest additions only for neurodebian wheezy
---

diff --git a/debian/TODO b/debian/TODO
index d85690e..4b50e0b 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -52,4 +52,4 @@ echo "I: success"
 
 *** ~/bin/docker-debians-run /bin/bash -c "apt-get -y update >/dev/null; apt-get install -y wget >/dev/null; bash <(wget -q --no-check-certificate -O- https://raw.githubusercontent.com/yarikoptic/neurodebian/enh/neurodebian-installer/tools/nd-configurerepo) --overwrite --install --mirror=us-nh" 
 
-
+* TODO use NEURODEBIAN_ENABLE env variable in postinst, add explicit option
diff --git a/debian/changelog b/debian/changelog
index a8e5327..a2b4724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ neurodebian (0.34) unstable; urgency=medium
     and suggestions)
   * debian/control
     - neurodebian-guest-additions:
+      - this binary package will be built ONLY for the NeuroDebian wheezy,
+        and that is why was removed from the stock debian/control
       - moved virtualbox-guest* dependencies into Depends (from
         Pre-Depends), and stripping deprecated -ose suffix
       - dropped depends on elderly gdm, now lightdm or any x-display-manager
diff --git a/debian/control b/debian/control
index 82ac7bc..f6629ed 100644
--- a/debian/control
+++ b/debian/control
@@ -76,21 +76,3 @@ Description: Helper for NeuroDebian popularity contest submissions
  You can always enable or disable your participation in popcon by
  running 'dpkg-reconfigure popularity-contest' as root.
 
-Package: neurodebian-guest-additions
-Architecture: all
-Depends: ${misc:Depends},
-		 virtualbox-guest-utils,
-		 virtualbox-guest-x11,
-		 virtualbox-guest-dkms,
-         sudo,
-         neurodebian-desktop,
-         lightdm | x-display-manager,
-		 zenity,
-Recommends: chromium,
-            update-notifier,
-Description: NeuroDebian guest additions (DO NOT INSTALL OUTSIDE VIRTUALBOX)
- This package configures a Debian installation as a guest operating system
- in a VirtualBox-based virtual machine for NeuroDebian.
- .
- DO NOT install this package unless you know what you are doing! For example,
- installation of this package relaxes several security mechanisms.
diff --git a/debian/patches/wheezy-dsc-patch b/debian/patches/wheezy-dsc-patch
index 4b219d2..d3be9cf 100644
--- a/debian/patches/wheezy-dsc-patch
+++ b/debian/patches/wheezy-dsc-patch
@@ -1,16 +1,35 @@
-From: Yaroslav Halchenko <debian@onerussian.com>
-Subject: While prepareing NeuroDebian VM based on wheezy, we would need update-manager-gnome present there
+Author: Yaroslav Halchenko <debian@onerussian.com>
+Description: guest-additions package to be built only for NeuroDebian repository
+  Its primarily purpose is customization of the NeuroDebian Virtualbox appliance.
+  As such it should not be generally useful and thus will be made available only
+  for specific builds of the package for the NeuroDebian repository.
 
 Origin: NeuroDebian
-Last-Update: 2014-08-13
+Last-Update: 2014-08-14
 
+diff --git a/debian/control b/debian/control
+index f6629ed..82ac7bc 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -87,6 +87,7 @@ Depends: ${misc:Depends},
-          lightdm | x-display-manager,
- 		 zenity,
- Recommends: chromium,
-+            update-manager-gnome,
-             update-notifier,
- Description: NeuroDebian guest additions (DO NOT INSTALL OUTSIDE VIRTUALBOX)
-  This package configures a Debian installation as a guest operating system
+@@ -76,3 +76,21 @@ Description: Helper for NeuroDebian popularity contest submissions
+  You can always enable or disable your participation in popcon by
+  running 'dpkg-reconfigure popularity-contest' as root.
+ 
++Package: neurodebian-guest-additions
++Architecture: all
++Depends: ${misc:Depends},
++		 virtualbox-guest-utils,
++		 virtualbox-guest-x11,
++		 virtualbox-guest-dkms,
++         sudo,
++         neurodebian-desktop,
++         lightdm | x-display-manager,
++		 zenity,
++Recommends: chromium,
++            update-notifier,
++Description: NeuroDebian guest additions (DO NOT INSTALL OUTSIDE VIRTUALBOX)
++ This package configures a Debian installation as a guest operating system
++ in a VirtualBox-based virtual machine for NeuroDebian.
++ .
++ DO NOT install this package unless you know what you are doing! For example,
++ installation of this package relaxes several security mechanisms.