Branch: r14.0.x

c66f1020 2014-12-25 12:00:27 Timothy Pearson
Add Debian packaging files for tde-ubuntu-integration, originally uploaded to the PPA
(cherry picked from commit 118299b6794f2ee32960ce503c10b5362416da63)
A debian/lenny/metapackages/tde-ubuntu-integration
A debian/squeeze/metapackages/tde-ubuntu-integration
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
A ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules
diff --git a/debian/lenny/metapackages/tde-ubuntu-integration b/debian/lenny/metapackages/tde-ubuntu-integration
new file mode 120000
index 0000000..4d48f38
--- /dev/null
+++ b/debian/lenny/metapackages/tde-ubuntu-integration
@@ -0,0 +1 @@
+../../../ubuntu/maverick/metapackages/tde-ubuntu-integration
\ No newline at end of file
diff --git a/debian/squeeze/metapackages/tde-ubuntu-integration b/debian/squeeze/metapackages/tde-ubuntu-integration
new file mode 120000
index 0000000..4d48f38
--- /dev/null
+++ b/debian/squeeze/metapackages/tde-ubuntu-integration
@@ -0,0 +1 @@
+../../../ubuntu/maverick/metapackages/tde-ubuntu-integration
\ No newline at end of file
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog
new file mode 100755
index 0000000..c0e67bf
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog
@@ -0,0 +1,5 @@
+tde-ubuntu-integration (0.1-0) maverick; urgency=low
+
+  * Initial version
+
+ -- Timothy Pearson <kb9vqf@...>  Mon, 08 Aug 2011 13:03:00 -0600
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat
new file mode 100755
index 0000000..7ed6ff8
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control
new file mode 100755
index 0000000..ef31290
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control
@@ -0,0 +1,14 @@
+Source: tde-ubuntu-integration
+Section: kde
+Priority: extra
+Maintainer: Timothy Pearson <kb9vqf@...>
+Uploaders: Timothy Pearson <kb9vqf@...>
+Build-Depends: debhelper (>=5.0), cdbs
+Standards-Version: 3.8.4
+
+Package: tde-ubuntu-integration
+Architecture: all
+Depends: policykit-1-gnome
+Description: TDE Ubuntu Integration
+ Ubuntu integration for TDE
+ This includes files needed for Polkit to function correctly under TDE
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs
new file mode 100755
index 0000000..ee19d5d
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs
@@ -0,0 +1 @@
+etc
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
new file mode 100755
index 0000000..2da7146
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
@@ -0,0 +1,12 @@
+FPACKAGE = tde-ubuntu-integration
+VERSION = 0.1-0
+
+build:
+
+clean:
+
+install:
+
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc/
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
new file mode 100644
index 0000000..7720f1c
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Comment=PolicyKit Authentication Agent
+Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=TDE;
+X-TDE-AutoRestart=true
+X-Ubuntu-Gettext-Domain=polkit-gnome-1
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules
new file mode 100755
index 0000000..e6b6748
--- /dev/null
+++ b/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules
@@ -0,0 +1,22 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+build: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+	dh_testdir
+	[ -e debian/stamp-distrospecific ] || \
+	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+	tee debian/stamp-distrospecific | \
+	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
19215f82 2014-12-25 12:00:46 Slávek Banko
Update kdebase-kio-plugins version in Conflicts for tdelibs-data on Debian and Ubuntu
to allow smooth upgrade by apt-get
This resolves Bug 2245

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit d528497c48f4af95d15fa0b0027aaaf1d283ad1a)
M debian/lenny/tdelibs/debian/control
M debian/squeeze/tdelibs/debian/control
M ubuntu/maverick/tdelibs/debian/control
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index e5a3ec6..68394e0 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -43,7 +43,7 @@
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index e5a3ec6..68394e0 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -43,7 +43,7 @@
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 85867e6..9289c4e 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -44,7 +44,7 @@
 Architecture: all
 Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:3.5.13.2), kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
e7624df8 2014-12-25 12:00:56 Slávek Banko
Fix cirucular dependency in tdepim on Debian and Ubuntu
This resolves Bug 2251

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 1fe13987fc1ece28b36fc39032127a648ed862f3)
M debian/lenny/tdepim/debian/control
M debian/squeeze/tdepim/debian/control
M ubuntu/maverick/tdepim/debian/control
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index c6bd10d..491be13 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -501,7 +501,7 @@
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index c6bd10d..491be13 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -501,7 +501,7 @@
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 1cd17ad..5d6a915 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -500,7 +500,7 @@
 Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev, libkcal2-trinity-dev
 Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-kde3-dev, libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.
afa8130c 2014-12-25 12:01:04 Slávek Banko
Add Ubuntu Vivid symlink

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 36c643e8fc9cefae3f4d5a79a18936b7e3389f4f)
A ubuntu/vivid
diff --git a/ubuntu/vivid b/ubuntu/vivid
new file mode 120000
index 0000000..5cb6e60
--- /dev/null
+++ b/ubuntu/vivid
@@ -0,0 +1 @@
+maverick
\ No newline at end of file
ae7f6da3 2014-12-25 12:01:14 Slávek Banko
Add Raspbian Wheezy symlink

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit f418587d09b9e5acfaadcfa88a18d0b333cf836b)
A raspbian/raspbian-wheezy
diff --git a/raspbian/raspbian-wheezy b/raspbian/raspbian-wheezy
new file mode 120000
index 0000000..2d806c6
--- /dev/null
+++ b/raspbian/raspbian-wheezy
@@ -0,0 +1 @@
+../debian/wheezy
\ No newline at end of file