[Pkg-tcltk-commits] r1067 - openacs/trunk/debian
geox-guest at alioth.debian.org
geox-guest at alioth.debian.org
Sat Sep 4 22:42:25 UTC 2010
Author: geox-guest
Date: 2010-09-04 22:42:25 +0000 (Sat, 04 Sep 2010)
New Revision: 1067
Added:
openacs/trunk/debian/repackage-upstream-src
Modified:
openacs/trunk/debian/README.Debian
openacs/trunk/debian/changelog
openacs/trunk/debian/control
openacs/trunk/debian/copyright
openacs/trunk/debian/rules
openacs/trunk/debian/watch
Log:
Removed non DFSG files and updated standards to 3.9.1
Modified: openacs/trunk/debian/README.Debian
===================================================================
--- openacs/trunk/debian/README.Debian 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/README.Debian 2010-09-04 22:42:25 UTC (rev 1067)
@@ -1,6 +1,16 @@
OpenACS for Debian
------------------
+- DFSG repackaged
+-----------------
+
+The following files have been deleted from the original tarball becaus
+e are not DFSG compliant:
+
+* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/iconsets/Tango/*
+* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/images/tango/*
+* /usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
+
- After Install
---------------
Modified: openacs/trunk/debian/changelog
===================================================================
--- openacs/trunk/debian/changelog 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/changelog 2010-09-04 22:42:25 UTC (rev 1067)
@@ -1,3 +1,10 @@
+openacs (5.5.1+dfsg-5) unstable; urgency=low
+
+ * Removed non DFSG files, check README.Debian for details. Closes: #591207
+ * Updated standards to 3.9.1
+
+ -- Hector Romojaro <hromojaro at dia.uned.es> Sat, 04 Sep 2010 21:50:04 +0200
+
openacs (5.5.1-4) unstable; urgency=low
* Updated translations:
Modified: openacs/trunk/debian/control
===================================================================
--- openacs/trunk/debian/control 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/control 2010-09-04 22:42:25 UTC (rev 1067)
@@ -5,7 +5,7 @@
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends-Indep: po-debconf
Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/openacs/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-tcltk/openacs/trunk
Homepage: http://www.openacs.org/
Modified: openacs/trunk/debian/copyright
===================================================================
--- openacs/trunk/debian/copyright 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/copyright 2010-09-04 22:42:25 UTC (rev 1067)
@@ -26,7 +26,6 @@
Crystal iconset for xinha, licensed under a LGPL license (see below)
GPL can be found in the file /usr/share/common-licenses/GPL,
- BSD license can be found in the file /usr/share/common-licenses/BSD,
LGPL v2.1 can be found in the file /usr/share/common-licenses/LGPL-2.1
--------------------------------------------------------------------------------
Added: openacs/trunk/debian/repackage-upstream-src
===================================================================
--- openacs/trunk/debian/repackage-upstream-src (rev 0)
+++ openacs/trunk/debian/repackage-upstream-src 2010-09-04 22:42:25 UTC (rev 1067)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Executed by uscan, repackages the upstream source removing
+# all non-DFSG content.
+
+set -e
+
+PACKAGE=$(dpkg-parsechangelog | sed -rn '/^Source:/ {s/^Source: //; p}')
+VERSION=$(echo $2 | sed 's/+dfsg//g')
+FILE=$3
+DIR="$PACKAGE-$VERSION"
+
+# Unpack
+tar xzf $FILE \
+ --exclude "*/packages/acs-templating/www/resources/xinha-nightly/iconsets/Tango" \
+ --exclude "*/packages/acs-templating/www/resources/xinha-nightly/images/tango" \
+ --exclude "*/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf"
+
+# Repack
+tar cz -f $FILE $DIR
+
+# Clean
+rm -rf $DIR
Property changes on: openacs/trunk/debian/repackage-upstream-src
___________________________________________________________________
Added: svn:executable
+ *
Modified: openacs/trunk/debian/rules
===================================================================
--- openacs/trunk/debian/rules 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/rules 2010-09-04 22:42:25 UTC (rev 1067)
@@ -9,11 +9,10 @@
get-orig-source:
if [ -d "../../tarballs" ]; then \
- uscan --download-current-version --destdir ../../tarballs/ ; \
- else \
- uscan --download-current-version ; \
- fi;
-
+ uscan --download-current-version --force-download --rename --destdir ../../tarballs/ ; \
+ else \
+ uscan --download-current-version --force-download --rename ; \
+ fi;
build:
clean: clean1 unpatch
@@ -51,11 +50,6 @@
rm debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/license.txt
rm debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/iconsets/Crystal/LICENSE
- # Deleting DFSG incompatible software (Tango iconset for Xinha, licensed by Creative Commons
- # Attribution-ShareAlike 2.5 License)
- rm -rf debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/iconsets/Tango/*
- rm -rf debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/images/tango/*
-
# Deleting some unneeded files
rm debian/openacs/var/log/aolserver4/openacs/log.txt
rm debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/img/Thumbs.db
Modified: openacs/trunk/debian/watch
===================================================================
--- openacs/trunk/debian/watch 2010-09-04 22:40:53 UTC (rev 1066)
+++ openacs/trunk/debian/watch 2010-09-04 22:42:25 UTC (rev 1067)
@@ -1,5 +1,5 @@
version=3
-opts="uversionmangle=s/\.\?revision_id\=(.*)//" \
-http://openacs.org/projects/openacs/download download/openacs-(.+)\.tgz(.*)
+opts="uversionmangle=s/\.\?revision_id\=(.*)/+dfsg/" \
+http://openacs.org/projects/openacs/download download/openacs-(.+)\.tgz(.*) debian debian/repackage-upstream-src
More information about the Pkg-tcltk-commits
mailing list