diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-29 11:53:36 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-29 11:53:36 +0200 |
| commit | 2230fce9f599644e9518a29d6773fb924a596120 (patch) | |
| tree | e6fb0b9aaafd25fbeab03b457f10b521fda27002 /ubuntu/raring/tdebase | |
| parent | 15546e1bdcca076459d4dde156a47334f8a64955 (diff) | |
| parent | 41edd1235c1100cbe0307af8da309da6f1ca3d87 (diff) | |
| download | tde-packaging-2230fce9f599644e9518a29d6773fb924a596120.tar.gz tde-packaging-2230fce9f599644e9518a29d6773fb924a596120.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/tdebase')
| -rw-r--r-- | ubuntu/raring/tdebase/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/raring/tdebase/debian/rules | 1 | ||||
| -rw-r--r-- | ubuntu/raring/tdebase/debian/tdebase-trinity-bin.postinst | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control index a6065defe..43c9f14aa 100644 --- a/ubuntu/raring/tdebase/debian/control +++ b/ubuntu/raring/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/ubuntu/raring/tdebase/debian/rules b/ubuntu/raring/tdebase/debian/rules index d212816b0..4d409f6b5 100755 --- a/ubuntu/raring/tdebase/debian/rules +++ b/ubuntu/raring/tdebase/debian/rules @@ -247,6 +247,7 @@ binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/autostart/ chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass + chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/tdekbdledsync binary-install/ksmserver-trinity:: install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop diff --git a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.postinst b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.postinst index 8e0bf94c8..e23d07de2 100644 --- a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.postinst +++ b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.postinst @@ -12,6 +12,7 @@ fi case "$1" in configure) chmod +s /opt/trinity/bin/kcheckpass || true + chmod +s /opt/trinity/bin/tdekbdledsync || true ;; abort-upgrade) ;; |