r65335 - in /trunk/libmojomojo-perl: MANIFEST debian/NEWS debian/changelog debian/control debian/repack.local debian/repack.stub debian/watch root/static/flash/swfupload.swf root/static/flash/swfupload_f8.swf root/static/flash/swfupload_f9.swf

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Nov 28 03:28:47 UTC 2010


Author: jawnsy-guest
Date: Sun Nov 28 03:28:36 2010
New Revision: 65335

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65335
Log:
* Repack package to remove non-free swfupload files
  (Closes: #591974)
* Add future swfupload package to Suggests

Added:
    trunk/libmojomojo-perl/debian/NEWS
    trunk/libmojomojo-perl/debian/repack.local
    trunk/libmojomojo-perl/debian/repack.stub   (with props)
Removed:
    trunk/libmojomojo-perl/root/static/flash/swfupload.swf
    trunk/libmojomojo-perl/root/static/flash/swfupload_f8.swf
    trunk/libmojomojo-perl/root/static/flash/swfupload_f9.swf
Modified:
    trunk/libmojomojo-perl/MANIFEST
    trunk/libmojomojo-perl/debian/changelog
    trunk/libmojomojo-perl/debian/control
    trunk/libmojomojo-perl/debian/watch

Modified: trunk/libmojomojo-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/MANIFEST?rev=65335&op=diff
==============================================================================
--- trunk/libmojomojo-perl/MANIFEST (original)
+++ trunk/libmojomojo-perl/MANIFEST Sun Nov 28 03:28:36 2010
@@ -292,9 +292,6 @@
 root/static/emote/wilted_rose.gif
 root/static/emote/wink_smile.gif
 root/static/favicon.ico
-root/static/flash/swfupload.swf
-root/static/flash/swfupload_f8.swf
-root/static/flash/swfupload_f9.swf
 root/static/gfx/background.jpg
 root/static/gfx/dropshadow.png
 root/static/gfx/header-long.png

Added: trunk/libmojomojo-perl/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/NEWS?rev=65335&op=file
==============================================================================
--- trunk/libmojomojo-perl/debian/NEWS (added)
+++ trunk/libmojomojo-perl/debian/NEWS Sun Nov 28 03:28:36 2010
@@ -1,0 +1,13 @@
+libmojomojo-perl (1.01+dfsg-1) unstable; urgency=low
+
+  The SWF Upload files used by MojoMojo has been removed from this and
+  future versions of libmojomojo-perl because it is considered non-free.
+
+  In the future, these files will hopefully be made available in an
+  swfupload package (see BTS#602253) in the non-free section of the
+  archive.
+
+  Until that time, these files must be downloaded separately from:
+  http://search.cpan.org/dist/MojoMojo/
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sat, 27 Nov 2010 22:43:49 -0500

Modified: trunk/libmojomojo-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/changelog?rev=65335&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/changelog (original)
+++ trunk/libmojomojo-perl/debian/changelog Sun Nov 28 03:28:36 2010
@@ -1,3 +1,11 @@
+libmojomojo-perl (1.01+dfsg-1) UNRELEASED; urgency=low
+
+  * Repack package to remove non-free swfupload files
+    (Closes: #591974)
+  * Add future swfupload package to Suggests
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sat, 27 Nov 2010 22:32:47 -0500
+
 libmojomojo-perl (1.01-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libmojomojo-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/control?rev=65335&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/control (original)
+++ trunk/libmojomojo-perl/debian/control Sun Nov 28 03:28:36 2010
@@ -122,7 +122,7 @@
  libyaml-perl
 Recommends: libxml-feed-perl, libsyntax-highlight-engine-kate-perl
 Suggests: libnet-amazon-perl, libxml-libxslt-perl, libxml-sax-perl,
- libxml-libxml-perl
+ libxml-libxml-perl, swfupload
 Description: wiki- and blog-inspired content management system
  MojoMojo is a feature-rich content management system, borrowing many useful
  concepts from wikis and blogs. It provides a simple interface to maintain a

Added: trunk/libmojomojo-perl/debian/repack.local
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/repack.local?rev=65335&op=file
==============================================================================
--- trunk/libmojomojo-perl/debian/repack.local (added)
+++ trunk/libmojomojo-perl/debian/repack.local Sun Nov 28 03:28:36 2010
@@ -1,0 +1,4 @@
+MANIFEST=1
+rm root/static/flash/swfupload_f8.swf
+rm root/static/flash/swfupload_f9.swf
+rm root/static/flash/swfupload.swf

Added: trunk/libmojomojo-perl/debian/repack.stub
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/repack.stub?rev=65335&op=file
==============================================================================
--- trunk/libmojomojo-perl/debian/repack.stub (added)
+++ trunk/libmojomojo-perl/debian/repack.stub Sun Nov 28 03:28:36 2010
@@ -1,0 +1,82 @@
+#!/bin/sh
+
+: <<=cut
+=pod
+
+=head1 NAME
+
+repack.stub - script to repack upstream tarballs from uscan
+
+=head1 INSTRUCTIONS
+
+put this in debian/repack.stub and add "debian sh debian/repack.stub" to
+the end of the line in debian/watch. you will also need to add a version
+mangle to debian/watch.
+
+then create a debian/repack.local. this is a shell script that is
+sources under "set -e", so be careful to check returns codes.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item rm
+
+rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item mv
+
+mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item requires_version
+
+requires_version is there for future usage for requiring certain versions of the script
+
+=back
+
+=head1 VARIABLES
+
+=over 4
+
+=item SUFFIX
+
+defaults to +dfsg
+
+what to append to the upstream version
+
+=item RM_OPTS
+
+defaults to -vrf
+
+options to pass to rm
+
+=item MANIFEST
+
+defaults to 0, set to 1 to turn on.
+
+this will manipulate MANIFEST files in CPAN tarballs.
+
+=item UP_BASE
+
+this is the directory where the upstream source is.
+
+=back
+
+=cut
+
+if [ -z "$REPACK_SH" ]; then
+    if [ -f ../../scripts/repack.sh ]; then
+        REPACK_SH=../../scripts/repack.sh
+    fi
+    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
+        REPACK_SH=$(which repack.sh)
+    fi
+fi
+
+if [ ! -f "$REPACK_SH" ]; then
+    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
+    echo "You can get it from http://svn.debian.org/viewsvn/pkg-perl/scripts/repack.sh"
+    exit 1
+fi
+
+exec "$REPACK_SH" "$@"

Propchange: trunk/libmojomojo-perl/debian/repack.stub
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/libmojomojo-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/watch?rev=65335&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/watch (original)
+++ trunk/libmojomojo-perl/debian/watch Sun Nov 28 03:28:36 2010
@@ -1,2 +1,6 @@
 version=3
-http://search.cpan.org/dist/MojoMojo/   .*/MojoMojo-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+
+opts="uversionmangle=s/\.\d\d$/$&0/;s/\.\d$/$&00/,dversionmangle=s/\+dfsg//" \
+	http://search.cpan.org/dist/MojoMojo/ \
+        .*/MojoMojo-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+        debian sh debian/repack.stub




More information about the Pkg-perl-cvs-commits mailing list