[Python-apps-commits] r7127 - in packages/laudio/trunk/debian (10 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Wed May 25 18:38:23 UTC 2011
Date: Wednesday, May 25, 2011 @ 18:38:22
Author: cjsmo-guest
Revision: 7127
rm db_version from config, rm if blocks from postrm postinst, fix typo in install, rm debian docs not needed, added get-orig-source for orig.tar.gz repack, added comments to copyright, added additional instructions to templates
Modified:
packages/laudio/trunk/debian/copyright
packages/laudio/trunk/debian/laudio.config
packages/laudio/trunk/debian/laudio.templates
packages/laudio/trunk/debian/postinst
packages/laudio/trunk/debian/postrm
packages/laudio/trunk/debian/rules
packages/laudio/trunk/debian/watch
Deleted:
packages/laudio/trunk/debian/docs
packages/laudio/trunk/debian/laudio.dirs
packages/laudio/trunk/debian/laudio.install
Modified: packages/laudio/trunk/debian/copyright
===================================================================
--- packages/laudio/trunk/debian/copyright 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/copyright 2011-05-25 18:38:22 UTC (rev 7127)
@@ -63,7 +63,7 @@
Files: laudio/src/scrobbler.py
Copyright: 2011 Michel Albert <exhuma at users.sourceforge.net>
-License: LGPL-2
+License: LGPL-2-kde-artists
Files: laudio/media/js/soundmanager/*
Copyright: 2007, Scott Schiller (schillmania.com)
@@ -91,15 +91,13 @@
.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in "/usr/share/common-licenses/GPL-3".
+Comment: On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
License: GPL-3
This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Library General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at your option) any
- later version.
+ Software Foundation; either version 3 of the License.
.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -108,6 +106,8 @@
.
You should have received a copy of the GNU Library General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
+Comment: On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
License: GPL-2
This program is free software; you can redistribute it and/or modify it under
@@ -123,7 +123,8 @@
this program; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.
- For full wording of above license, see '/usr/share/common-licenses/GPL-2.
+Comment: On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -141,7 +142,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-License: LGPL-2
+License: LGPL-2-kde-artists
The GNU Lesser General Public License or LGPL is written for software
libraries in the first place. We expressly want the LGPL to be valid for this
artwork library too.
@@ -162,8 +163,8 @@
.
The exception in section 5 of the GNU Lesser General Public License covers
the use of elements of this art library in a GUI. kde-artists [at] kde.org
- .
- For full wording of above license, see '/usr/share/common-licenses/LGPL-2.
+Comment: On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
License: ISC
Redistribution and use in source and binary forms, with or without
@@ -336,8 +337,8 @@
.
The license granted in Section 3 above is expressly made subject to and
limited by the following restrictions:
-
-You may Distribute or Publicly Perform the Work only under the terms of this
+ .
+ You may Distribute or Publicly Perform the Work only under the terms of this
License. You must include a copy of, or the Uniform Resource Identifier (URI)
for, this License with every copy of the Work You Distribute or Publicly
Perform. You may not offer or impose any terms on the Work that restrict the
Deleted: packages/laudio/trunk/debian/docs
===================================================================
--- packages/laudio/trunk/debian/docs 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/docs 2011-05-25 18:38:22 UTC (rev 7127)
@@ -1,3 +0,0 @@
-AUTHORS
-README.rst
-MANIFEST.in
Modified: packages/laudio/trunk/debian/laudio.config
===================================================================
--- packages/laudio/trunk/debian/laudio.config 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/laudio.config 2011-05-25 18:38:22 UTC (rev 7127)
@@ -4,7 +4,6 @@
# Source debconf library.
. /usr/share/debconf/confmodule
-db_version 2.0 || [ 0 -lt 30 ]
if [ "$1" = "configure" ]; then
db_input high laudio/reload_webserver || true
Deleted: packages/laudio/trunk/debian/laudio.dirs
===================================================================
--- packages/laudio/trunk/debian/laudio.dirs 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/laudio.dirs 2011-05-25 18:38:22 UTC (rev 7127)
@@ -1,2 +0,0 @@
-/var/log/laudio/
-/var/lib/laudio
Deleted: packages/laudio/trunk/debian/laudio.install
===================================================================
--- packages/laudio/trunk/debian/laudio.install 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/laudio.install 2011-05-25 18:38:22 UTC (rev 7127)
@@ -1,4 +0,0 @@
-laudio_apache.conf /etc/laudio
-laudio/media /usr/share/laudio/laudio
-laudio/tpl /usr/share/laudio/laudio
-laudio/src /usr/share/laudio/laudio
Modified: packages/laudio/trunk/debian/laudio.templates
===================================================================
--- packages/laudio/trunk/debian/laudio.templates 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/laudio.templates 2011-05-25 18:38:22 UTC (rev 7127)
@@ -7,4 +7,7 @@
reload it automatically now or do it yourself later.
.
To manually reload the web server configuration file, use the following
- command: "/etc/init.d/apache2 restart"
+ command: "/etc/init.d/apache2 reload".
+ .
+ Additionally to manually restart the web server, use the following command:
+ "/etc/init.d/apache2 restart".
Modified: packages/laudio/trunk/debian/postinst
===================================================================
--- packages/laudio/trunk/debian/postinst 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/postinst 2011-05-25 18:38:22 UTC (rev 7127)
@@ -2,30 +2,12 @@
set -e
+lac="/etc/laudio/laudio_apache.conf"
+alac="/etc/apache2/conf.d/laudio_apache.conf"
+
# Source debconf library.
. /usr/share/debconf/confmodule
-#Set file and folder permissions
-prms_fix() {
- dirs=( "/usr/share/laudio" "/var/lib/laudio" "/var/log/laudio" )
- for elem in ${dirs[@]}; do
- chown -R www-data:www-data $elem
- chmod -R 0770 $elem
- done
- find ./usr/share/laudio/laudio -name "*.py" -exec chmod 644 {} \;
-}
-
-#Create apache2 alias symlink
-apache_link() {
- lac=/etc/laudio/laudio_apache.conf
- alac=/etc/apache2/conf.d/laudio_apache.conf
- if [ -f $lac ]; then
- if [ ! -e $alac ]; then
- ln -s $lac $alac
- fi
- fi
-}
-
if [ "$1" = "configure" ]; then
#Set up the db
if [ -e /var/lib/laudio/laudio.db ]; then
@@ -37,19 +19,19 @@
db_get laudio/reload_webserver || true
#if yes, setup laudio
if [ "$RET" = "true" ]; then
- apache_link
- prms_fix
+ if [ -f $lac -a ! -h $alac ]; then
+ ln -s $lac $alac
+ fi
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d apache2 reload 3>/dev/null || true
else
/etc/init.d/apache2 reload 3>/dev/null || true
fi
- fi
- #If answer is no setup symlink, fix perms then exit gracefully.
+ fi
if [ "$RET" = "false" ]; then
- apache_link
- prms_fix
- exit 0
+ if [ -f $lac -a ! -e $alac ]; then
+ ln -s $lac $alac
+ fi
fi
fi
Modified: packages/laudio/trunk/debian/postrm
===================================================================
--- packages/laudio/trunk/debian/postrm 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/postrm 2011-05-25 18:38:22 UTC (rev 7127)
@@ -16,40 +16,22 @@
if [ "$1" = "purge" ]; then
db_get laudio/reload_webserver || true
- #if yes, setup laudio
if [ "$RET" = "true" ]; then
- if [ -e $LOG_FILE ]; then
- rm -rf $LOG_FILE
- fi
- if [ -e $INSTALL_DIR ]; then
- rm -rf $INSTALL_DIR
- fi
- if [ -e $DB_FILE ]; then
- rm -rf $DB_FILE
- fi
- if [ -e $alac ]; then
- rm -f $alac/laudio_apache.conf
- fi
+ rm -rf $LOG_FILE
+ rm -rf $INSTALL_DIR
+ rm -rf $DB_FILE
+ rm -f $alac/laudio_apache.conf
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d apache2 reload 3>/dev/null || true
else
/etc/init.d/apache2 reload 3>/dev/null || true
fi
+ else
+ rm -rf $LOG_FILE
+ rm -rf $INSTALL_DIR
+ rm -rf $DB_FILE
+ rm -f $alac/laudio_apache.conf
fi
- if [ "$RET" = "false" ]; then
- if [ -e $LOG_FILE ]; then
- rm -rf $LOG_FILE
- fi
- if [ -e $INSTALL_DIR ]; then
- rm -rf $INSTALL_DIR
- fi
- if [ -e $DB_FILE ]; then
- rm -rf $DB_FILE
- fi
- if [ -e $alac ]; then
- rm -f $alac/laudio_apache.conf
- fi
- fi
fi
#DEBHELPER#
Modified: packages/laudio/trunk/debian/rules
===================================================================
--- packages/laudio/trunk/debian/rules 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/rules 2011-05-25 18:38:22 UTC (rev 7127)
@@ -3,6 +3,8 @@
# Grab the version from the changelog, up to the first -
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+DESTDIR=$(CURDIR)/debian/laudio
+
%:
dh $@ --with python2
@@ -10,19 +12,27 @@
dh_auto_install -- --install-lib=/usr/share/laudio
override_dh_install:
- dh_install -XCOPYING -Xjquery-1.5.min.js -Xsetup.sh -XMANIFEST.in \
- -XREADME.rst -XAUTHORS
- rm -f ./laudio/media/js/soundmanager/swf/soundmanager2_debug.swf
- mtasc ./laudio/media/js/soundmanager/src/SoundManager2.as \
- -swf ./laudio/media/js/soundmanager/swf/soundmanager2_debug.swf \
- -main -header 16:16:30 -v -version 8
+ dh_install
+ install -m 0770 -o www-data -g www-data -d $(DESTDIR)/var/log/laudio
+ install -m 0770 -o www-data -g www-data -d $(DESTDIR)/var/lib/laudio
+ mtasc $(DESTDIR)/usr/share/laudio/laudio/media/js/soundmanager/src/SoundManager2.as \
+ -swf $(DESTDIR)/usr/share/laudio/laudio/media/js/soundmanager/swf/soundmanager2_debug.swf \
+ -main -header 16:16:30 -v -version 8
get-orig-source:
uscan --noconf --force-download --download-current-version --no-symlink --destdir=.
- tar -xvf v$(DEB_UPSTREAM_VERSION).tar.gz
- rm v$(DEB_UPSTREAM_VERSION).tar.gz
+ tar -xvf v*.tar.gz
mv Raydiation-Laudio-* laudio-$(DEB_UPSTREAM_VERSION)
- GZIP=--best tar -cz --owner root --group root --mode a+rX \
- -f laudio_$(DEB_UPSTREAM_VERSION).orig.tar.gz laudio-$(DEB_UPSTREAM_VERSION)
+ rm v*.tar.gz
+ rm laudio-$(DEB_UPSTREAM_VERSION)/AUTHORS
+ rm laudio-$(DEB_UPSTREAM_VERSION)/COPYING
+ rm laudio-$(DEB_UPSTREAM_VERSION)/MANIFEST.in
+ rm laudio-$(DEB_UPSTREAM_VERSION)/README.rst
+ rm laudio-$(DEB_UPSTREAM_VERSION)/setup.sh
+ rm laudio-$(DEB_UPSTREAM_VERSION)/laudio/media/js/jquery-1.5.min.js
+ rm laudio-$(DEB_UPSTREAM_VERSION)/laudio/media/js/soundmanager/swf/soundmanager2_debug.swf
+ GZIP=--best tar -cz --owner root --group root --mode a+rX -f \
+ laudio_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+ laudio-$(DEB_UPSTREAM_VERSION)
rm -r laudio-$(DEB_UPSTREAM_VERSION)
Modified: packages/laudio/trunk/debian/watch
===================================================================
--- packages/laudio/trunk/debian/watch 2011-05-25 17:22:32 UTC (rev 7126)
+++ packages/laudio/trunk/debian/watch 2011-05-25 18:38:22 UTC (rev 7127)
@@ -1,4 +1,5 @@
#Watch file for laudio
version=3
+opts=dversionmangle=s/\+ds// \
http://githubredir.debian.net/github/raydiation/laudio/v(.*).tar.gz
More information about the Python-apps-commits
mailing list