updated template, fixed up control, updated patch, added custom series for quilt...

diff --git a/debian/changelog b/debian/changelog
index 105d4f4764e5c2b90054623aea921ea3636d4128..a8e53277c311412f22465c5048944037b06f5e51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ neurodebian (0.34) unstable; urgency=medium
     ftpmaster concerns (Thanks Ansgar Burchardt for the thorough review
     and suggestions)
   * debian/control
-    - neurodebian-guest-additions: moved virtualbox-guest* dependencies
-      into Depends (from Pre-Depends), and stripping deprecated -ose suffix
+    - neurodebian-guest-additions:
+      - 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
     - fixing package names for chromium, and removing update-manager-gnome
       N/A in sid
   * debian/neurodebian-popularity-contest.*

diff --git a/debian/control b/debian/control
index 644451060cf2d2fb9bcf169a737be9c6b6ce0d9a..82ac7bc1df84345ee5508ee89f5a17c0739282c9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -78,14 +78,13 @@ Description: Helper for NeuroDebian popularity contest submissions
 
 Package: neurodebian-guest-additions
 Architecture: all
-Depends:
- virtualbox-guest-utils,
- virtualbox-guest-x11,
- virtualbox-guest-dkms,
 Depends: ${misc:Depends},
+                virtualbox-guest-utils,
+                virtualbox-guest-x11,
+                virtualbox-guest-dkms,
          sudo,
          neurodebian-desktop,
-         gdm | lightdm,
+         lightdm | x-display-manager,
                 zenity,
 Recommends: chromium,
             update-notifier,

diff --git a/debian/patches/series-wheezy-dsc b/debian/patches/series-wheezy-dsc
new file mode 100644 (file)
index 0000000..9eda788
--- /dev/null
+++ b/debian/patches/series-wheezy-dsc
@@ -0,0 +1 @@
+wheezy-dsc-patch

diff --git a/debian/patches/wheezy-dsc-patch b/debian/patches/wheezy-dsc-patch
index 36b9b5a36392333d2209481411ee902d5a858e44..4b219d2a23c7613259a18add2a6173252927e34a 100644 (file)
--- a/debian/patches/wheezy-dsc-patch
+++ b/debian/patches/wheezy-dsc-patch
@@ -4,12 +4,10 @@ Subject: While prepareing NeuroDebian VM based on wheezy, we would need update-m
 Origin: NeuroDebian
 Last-Update: 2014-08-13
 
-diff --git a/debian/control b/debian/control
-index 6444510..70cf60e 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -88,6 +88,7 @@ Depends: ${misc:Depends},
-          gdm | lightdm,
+@@ -87,6 +87,7 @@ Depends: ${misc:Depends},
+          lightdm | x-display-manager,
                 zenity,
  Recommends: chromium,
 +            update-manager-gnome,

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 9de61707131d27960d56fa7439c20e0a54993dae..8d51e48c191c7ae2d2f34544dc9cd1147c3b3156 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neurodebian\n"
 "Report-Msgid-Bugs-To: neurodebian@packages.debian.org\n"
-"POT-Creation-Date: 2014-08-08 15:23-0400\n"
+"POT-Creation-Date: 2014-08-13 14:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,7 +162,7 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../neurodebian.templates:8001
-msgid "APT list of packages needs to be updated."
+msgid "APT list of packages needs to be updated"
 msgstr ""
 
 #. Type: note