[SCM] breeze packaging branch, kubuntu_wily_archive, updated. d8ac31c8e076475f978e7bae07aa19e8f1692d55
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Mon Jun 29 16:55:28 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=d8ac31c
The following commit has been merged in the kubuntu_wily_archive branch:
commit d8ac31c8e076475f978e7bae07aa19e8f1692d55
Author: Jonathan Riddell <jr at jriddell.org>
Date: Mon Jun 29 18:55:26 2015 +0200
merge master
---
debian/rules | 7 -------
1 file changed, 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index 02fe2c0..6738731 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,6 @@
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-<<<<<<< HEAD
-override_dh_install:
- debian/wrapperthemes.sh breeze_cursors
- debian/wrapperthemes.sh Breeze_Snow
- $(overridden_command)
-=======
override_dh_auto_clean:
$(overridden_command)
rm -rf build-qt4
@@ -23,7 +17,6 @@ override_dh_auto_build:
override_dh_auto_install:
$(overridden_command)
$(overridden_command) --builddirectory=build-qt4
->>>>>>> master
override_dh_strip:
$(overridden_command) --dbg-package=breeze-dbg
--
breeze packaging
More information about the pkg-kde-commits
mailing list