SVN commit 804763 by sitter:
apparently the screwdriver was still a tiny little bit broken :S
* fix dependencies
* move amarok-nightly starter script to amarok-nightly-tools
M +0 -7 amarok-debian/rules
M +14 -0 dev/debian/changelog
M +1 -0 dev/debian/control
A dev/scripts/amarok-nightly
M +4 -2 dev/scripts/amarok-nightly-vars
M +2 -4 dev/scripts/neonmake
---
trunk/extragear/multimedia/amarok/supplementary_scripts/neon/distros/ubuntu/amarok-debian/rules
#804762:804763
@@ -6,13 +6,6 @@
-include /opt/amarok-nightly/cdbs/kde.mk
kde4-wrapper-creation:
- mkdir -p $(DEB_DESTDIR)/usr/bin
- echo "#!/bin/sh" > $(DEB_DESTDIR)/usr/bin/amarok-nightly; \
- echo /usr/bin/amarok-nightly-vars >>
$(DEB_DESTDIR)/usr/bin/amarok-nightly; \
- echo /opt/amarok-nightly/bin/kbuildsycoca4 >>
$(DEB_DESTDIR)/usr/bin/amarok-nightly; \
- echo /opt/amarok-nightly/bin/amarok --style oxygen \"[EMAIL
PROTECTED]" >> $(DEB_DESTDIR)/usr/bin/amarok-nightly; \
- chmod 755 $(DEB_DESTDIR)/usr/bin/amarok-nightly; \
-
mkdir -p $(DEB_DESTDIR)/usr/share/applications
cat
$(DEB_DESTDIR)/opt/amarok-nightly/share/applications/kde4/amarok.desktop \
| sed 's/Name.*=.*$$/& Nightly/' \
---
trunk/extragear/multimedia/amarok/supplementary_scripts/neon/distros/ubuntu/dev/debian/changelog
#804762:804763
@@ -1,3 +1,17 @@
+amarok-nightly-tools (1.2) hardy; urgency=low
+
+ * Fix scripts
+ * Moved amarok-nightly wrapper from amarok-nightly package, since it depends
+ amarok-nightly-tools anyway.
+
+ -- Harald Sitter <[EMAIL PROTECTED]> Tue, 06 May 2008 23:28:18 +0200
+
+amarok-nightly-tools (1.1) hardy; urgency=low
+
+ * Rename
+
+ -- Harald Sitter <[EMAIL PROTECTED]> Tue, 06 May 2008 23:27:52 +0200
+
amarok-nightly-tools (1.0) hardy; urgency=low
* Initial release of development related stuff
---
trunk/extragear/multimedia/amarok/supplementary_scripts/neon/distros/ubuntu/dev/debian/control
#804762:804763
@@ -9,6 +9,7 @@
Package: amarok-nightly-tools
Architecture: all
Recommends: amarok-nightly-deps
+Conflicts: amarok-nightly (<= 20080505+svn804295-0amarok1)
Description: Tools for Project Neon (Amarok Nightly)
Project Neon tools
---
trunk/extragear/multimedia/amarok/supplementary_scripts/neon/distros/ubuntu/dev/scripts/amarok-nightly-vars
#804762:804763
@@ -1,5 +1,7 @@
-#!/bin/sh
+#!/bin/bash
source /opt/amarok-nightly/neon/data/varsrc
-echo "WARNING!!!!!!!: the current shell is configured for Project Neon (Amarok
Nightly Builds), you really _DO NOT_ want to start any GUI application besides
amarok-nightly!!!"
+echo "WARNING!!!!!!!: the current shell is configured for Project Neon (Amarok
Nightly Builds), you really _DO NOT_ want to start any GUI application besides
amarok-nightly!!!\nLeave with -> exit"
+
+bash
---
trunk/extragear/multimedia/amarok/supplementary_scripts/neon/distros/ubuntu/dev/scripts/neonmake
#804762:804763
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-/usr/bin/amarok-nightly-vars
+source /opt/amarok-nightly/neon/data/varsrc
export KDE_COLOR_DEBUG=1
export QTEST_COLORED=1
@@ -8,5 +8,3 @@
cmake "../" -DCMAKE_INSTALL_PREFIX=$NEONDIR -DCMAKE_BUILD_TYPE=debugfull && \
nice make -j2 && \
make install;
-
-echo "WARNING!!!!!!!: the current shell is configured for Project Neon (Amarok
Nightly Builds), you really _DO NOT_ want to start any GUI application besides
amarok-nightly!!!"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
