[SCM] Debian packaging of Prophet CPAN distribution branch, master, updated. upstream/0.743-9-g4121c8c

Ioan Rogers ioan at dirtysoft.ca
Thu Oct 4 04:43:40 UTC 2012


The following commit has been merged in the master branch:
commit 4121c8c0f86be9be4031e143cb6adf0e5b1c9b59
Author: Ioan Rogers <ioan at dirtysoft.ca>
Date:   Wed Oct 3 20:48:36 2012 -0700

    Repacking to remove debian-packaged javascript which is handled in prophet, see debbugs #576628

diff --git a/debian/changelog b/debian/changelog
index af579af..1795ca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-prophet (0.750-1) UNRELEASED; urgency=low
+prophet (0.750-1+ds) UNRELEASED; urgency=low
 
   * Take over for the Debian Perl Group on maintainer's request
     (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627174)
@@ -8,7 +8,7 @@ prophet (0.750-1) UNRELEASED; urgency=low
     <christine at debian.org>); Christine Spang <christine at debian.org>
     moved to Uploaders.
   * Updated standards version, finishing takeover
-  * Imported Upstream version 0.750
+  * Imported Upstream version 0.750 (Closes: #576628)
 
  -- Ioan Rogers <ioan at dirtysoft.ca>  Fri, 28 Sep 2012 17:31:00 -0700
 
diff --git a/debian/control b/debian/control
index f0ddaff..cd1ecd9 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,8 @@ Depends: ${perl:Depends}, ${misc:Depends},
   libtemplate-declare-perl (>= 0.35), libterm-readkey-perl,
   libfile-sharedir-perl (>= 1.00), libhttp-server-simple-perl (>= 0.40),
   libdbd-sqlite3-perl (>= 1.00), libjson-xs-perl (>= 2.222),
-  libterm-readline-perl-perl | libterm-readline-gnu-perl, rsync
+  libterm-readline-perl-perl | libterm-readline-gnu-perl, rsync,
+  libjs-jquery, libjs-yui
 Recommends: libnet-rendezvous-publish-backend-avahi-perl, libnet-bonjour-perl
 Description: distributed, peer-to-peer replicated database system
  Prophet is a lightweight schemaless database designed for peer to peer
diff --git a/debian/repack.local b/debian/repack.local
new file mode 100644
index 0000000..3e55ea2
--- /dev/null
+++ b/debian/repack.local
@@ -0,0 +1,3 @@
+MANIFEST=1
+rm -rf share/web/static/yui
+rm share/web/static/jquery/js/jquery-1.2.6.min.js
diff --git a/debian/repack.stub b/debian/repack.stub
new file mode 100755
index 0000000..76b65bd
--- /dev/null
+++ b/debian/repack.stub
@@ -0,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
+sourced 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://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
+    exit 1
+fi
+
+exec "$REPACK_SH" "$@"
diff --git a/debian/watch b/debian/watch
index 1be1d40..9e1c5eb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://search.cpan.org/dist/Prophet/   .*/Prophet-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts=dversionmangle=s/\+ds$// \
+     http://search.cpan.org/dist/Prophet/    .*/Prophet-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+     debian sh debian/repack.stub

-- 
Debian packaging of Prophet CPAN distribution



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