summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/control6
-rwxr-xr-xetc/skel/Desktop/libreoffice-calc.desktop2
-rwxr-xr-xetc/skel/Desktop/libreoffice-impress.desktop2
-rwxr-xr-xetc/skel/Desktop/libreoffice-writer.desktop2
5 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 09258ee..b3c4972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ itzks-systems (2012.10.12.1) UNRELEASED; urgency=low
* dirvish templates:
+ Exclude proc, sys, dev/pts in case any of them is mounted. Exclude
NBD swap files.
+ * /etc/skel:
+ + Adapt icon names in libreoffice-*.desktop to names found in the libreoffice
+ 3.5.4 package series.
+ * /debian/control:
+ + Versioned dependency on libreoffice (>= 3.5.4).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 02 Oct 2012 21:45:44 +0200
diff --git a/debian/control b/debian/control
index 71e31da..908164b 100644
--- a/debian/control
+++ b/debian/control
@@ -244,7 +244,7 @@ Depends:
itzks-keyring,
kturtle,
lazarus,
- libreoffice,
+ libreoffice (>= 3.5.4),
libreoffice-base,
libreoffice-base-core,
libreoffice-calc,
@@ -398,7 +398,7 @@ Depends:
itzks-keyring,
kturtle,
lazarus,
- libreoffice,
+ libreoffice (>= 3.5.4),
libreoffice-base,
libreoffice-base-core,
libreoffice-calc,
@@ -555,7 +555,7 @@ Depends:
itzks-keyring,
kturtle,
lazarus,
- libreoffice,
+ libreoffice (>= 3.5.4),
libreoffice-base,
libreoffice-base-core,
libreoffice-calc,
diff --git a/etc/skel/Desktop/libreoffice-calc.desktop b/etc/skel/Desktop/libreoffice-calc.desktop
index 88d3753..10e0fce 100755
--- a/etc/skel/Desktop/libreoffice-calc.desktop
+++ b/etc/skel/Desktop/libreoffice-calc.desktop
@@ -3,7 +3,7 @@
[Desktop Entry]
Version=1.0
Terminal=false
-Icon=libreoffice34-calc
+Icon=libreoffice-calc
Type=Application
Categories=Office;
Exec=libreoffice --calc %U
diff --git a/etc/skel/Desktop/libreoffice-impress.desktop b/etc/skel/Desktop/libreoffice-impress.desktop
index 1f6cd3e..9e21133 100755
--- a/etc/skel/Desktop/libreoffice-impress.desktop
+++ b/etc/skel/Desktop/libreoffice-impress.desktop
@@ -3,7 +3,7 @@
[Desktop Entry]
Version=1.0
Terminal=false
-Icon=libreoffice34-impress
+Icon=libreoffice-impress
Type=Application
Categories=Office;
Exec=libreoffice --impress %U
diff --git a/etc/skel/Desktop/libreoffice-writer.desktop b/etc/skel/Desktop/libreoffice-writer.desktop
index fe12564..8fd09b7 100755
--- a/etc/skel/Desktop/libreoffice-writer.desktop
+++ b/etc/skel/Desktop/libreoffice-writer.desktop
@@ -3,7 +3,7 @@
[Desktop Entry]
Version=1.0
Terminal=false
-Icon=libreoffice34-writer
+Icon=libreoffice-writer
Type=Application
Categories=Office;
Exec=libreoffice --writer %U