summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/tdenetworkmanager
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-27 13:20:16 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-27 13:20:16 +0900
commit229e7f5038cbc5f930ab50abfad3099919a4e8bb (patch)
tree569abf2cbc4bd05a0b90ed759ccd941eaa676c01 /ubuntu/maverick/applications/tdenetworkmanager
parent59f50d7552dacb6d27d0768a9a5320e5ba2fc23d (diff)
parent50c481625fcb2361e0aaae71df24a40cbad056d7 (diff)
downloadtde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.tar.gz
tde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/tdenetworkmanager')
-rw-r--r--ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl8
-rwxr-xr-xubuntu/maverick/applications/tdenetworkmanager/debian/rules5
2 files changed, 4 insertions, 9 deletions
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
index d85bb14dc..e7a182904 100755
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
@@ -22,8 +22,3 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-
-binary-install/network-manager-kde-trinity::
- # Install autostart file
- install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \
- debian/network-manager-kde-trinity/opt/trinity/share/autostart/tdenetworkmanager-trinity.desktop