From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 13 Aug 2014 18:10:03 +0000 (-0400)
Subject: updated template, fixed up control, updated patch, added custom series for quilt...
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d21dffb99ff26cc5dbff1842c7558692bb9869ca;p=neurodebian.git
updated template, fixed up control, updated patch, added custom series for quilt to ease updates of the wheezy dsc patches
---
diff --git a/debian/changelog b/debian/changelog
index 105d4f4..a8e5327 100644
--- 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 6444510..82ac7bc 100644
--- 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
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 36b9b5a..4b219d2 100644
--- 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 9de6170..8d51e48 100644
--- 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