[Python-apps-commits] r12486 - in packages/sabnzbdplus/trunk/debian (6 files)

jcfp-guest at users.alioth.debian.org jcfp-guest at users.alioth.debian.org
Tue Oct 13 21:11:47 UTC 2015 

    Date: Tuesday, October 13, 2015 @ 21:11:46
  Author: jcfp-guest
Revision: 12486

  + override source-is-missing for assorted maintainer-added
    sources: all of these lintian hits are false positives.
* Create a get-orig-source target to copy missing sources into the
  upstream tarball instead of keeping them in d/missing-sources.
* Add build-deps on devscripts, dpkg-dev, and subversion: needed by
  get-orig-source.
* Watch file: add dversionmangle to handle +dfsg suffix.
* Copyright: adjust paths for missing-sources files.

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/copyright
  packages/sabnzbdplus/trunk/debian/rules
  packages/sabnzbdplus/trunk/debian/source/lintian-overrides
  packages/sabnzbdplus/trunk/debian/watch

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/changelog	2015-10-13 21:11:46 UTC (rev 12486)
@@ -1,14 +1,20 @@
-sabnzbdplus (0.7.20-2) unstable; urgency=medium
+sabnzbdplus (0.7.20+dfsg-1) UNRELEASED; urgency=medium
 
   * Upload to unstable.
-  * Lintian:
+  * Lintian: 
     + override source-contains-prebuilt-javascript-object: their
       inclusion by upstream is intentional.
-    + override source-is-missing for files under d/missing-sources
-      as these will always be false-positives.
+    + override source-is-missing for assorted maintainer-added
+      sources: all of these lintian hits are false positives.
   * Add missing source files for Plotkit.js.
+  * Create a get-orig-source target to copy missing sources into the
+    upstream tarball instead of keeping them in d/missing-sources.
+  * Add build-deps on devscripts, dpkg-dev, and subversion: needed by
+    get-orig-source.
+  * Watch file: add dversionmangle to handle +dfsg suffix.
+  * Copyright: adjust paths for missing-sources files.
 
- -- JCF Ploemen (jcfp) <linux at jcf.pm>  Thu, 17 Sep 2015 05:50:54 +0700
+ -- JCF Ploemen (jcfp) <linux at jcf.pm>  Tue, 13 Oct 2015 21:10:32 +0000
 
 sabnzbdplus (0.7.20-1) experimental; urgency=medium
 

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/control	2015-10-13 21:11:46 UTC (rev 12486)
@@ -4,7 +4,14 @@
 Priority: optional
 Maintainer: JCF Ploemen (jcfp) <linux at jcf.pm>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python, imagemagick, dh-python
+Build-Depends: 
+ debhelper (>= 9),
+ devscripts,
+ dh-python,
+ dpkg-dev (>=1.17),
+ imagemagick,
+ python,
+ subversion
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.5
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/sabnzbdplus/trunk/

Modified: packages/sabnzbdplus/trunk/debian/copyright
===================================================================
--- packages/sabnzbdplus/trunk/debian/copyright	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/copyright	2015-10-13 21:11:46 UTC (rev 12486)
@@ -428,7 +428,7 @@
 
 
 * interfaces/smpl/templates/static/PlotKit/PlotKit.js
-* debian/missing-sources/Plush/PlotKit/*
+* interfaces/smpl/templates/static/PlotKit/src/*.js
 	Copyright (C) 2005,2006 by Alastair Tse <alastair^liquidx.net>
 License:
 	Copyright (c) 2006, Alastair Tse
@@ -517,37 +517,37 @@
 License: GPL-2+
 
 
-* debian/missing-sources/Config/jquery-1.7.2.js
+* interfaces/Config/templates/staticcfg/js/src/jquery-1.7.2.js
         Copyright (C) 2011 by John Resig
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Config/jquery.ui.core.js
-* debian/missing-sources/Config/jquery.ui.autocomplete.js
-* debian/missing-sources/Config/jquery.ui.dialog.js
-* debian/missing-sources/Config/jquery.ui.droppable.js
-* debian/missing-sources/Config/jquery.ui.mouse.js
-* debian/missing-sources/Config/jquery.ui.selectable.js
-* debian/missing-sources/Config/jquery.ui.widget.js
-* debian/missing-sources/Config/jquery.ui.sortable.js
-* debian/missing-sources/Config/jquery.ui.draggable.js
-* debian/missing-sources/Config/jquery.ui.resizable.js
-* debian/missing-sources/Config/jquery.ui.button.js
-* debian/missing-sources/Config/jquery.ui.position.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.core.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.autocomplete.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.dialog.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.droppable.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.mouse.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.selectable.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.widget.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.sortable.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.draggable.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.resizable.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.button.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.ui.position.js
 	Copyright (C) 2011 by AUTHORS.txt (http://jqueryui.com/about)
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Config/jqtools.tabs_1.2.6.js
+* interfaces/Config/templates/staticcfg/js/src/jqtools.tabs_1.2.6.js
 License: "NO COPYRIGHTS OR LICENSES. DO WHAT YOU LIKE."
 
 
-* debian/missing-sources/Config/jquery.qtip.js
+* interfaces/Config/templates/staticcfg/js/src/jquery.qtip.js
 	Copyright (C) 2009-2010 by Craig Michael Thompson
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Mobile/jquery.js
+* interfaces/Mobile/templates/static/javascripts/src/jquery.js
 This file contains code from various sources:
 	"jquery"
 	Copyright (C) 2009 by John Resig
@@ -559,12 +559,12 @@
 License: triple-licensed MIT, BSD-sizzle, GPL-2
 
 
-* debian/missing-sources/Mobile/jqtouch.js
+* interfaces/Mobile/templates/static/javascripts/src/jqtouch.js
 	Copyright (C) 2009 by the jQTouch project members
 License: MIT
 
 
-* debian/missing-sources/Plush/jquery+sizzle_1.6.2.js
+* interfaces/Plush/templates/static/javascripts/src/jquery+sizzle_1.6.2.js
 This file contains code from a number of different sources:
 	"jquery"
 	Copyright (C) 2009 by John Resig
@@ -576,66 +576,66 @@
 License: triple-licensed MIT, BSD-sizzle, GPL-2
 
 
-* debian/missing-sources/Plush/jquery.ui.core.js
-* debian/missing-sources/Plush/jquery.ui.widget.js
-* debian/missing-sources/Plush/jquery.ui.tabs.js
-* debian/missing-sources/Plush/jquery.ui.button.js
-* debian/missing-sources/Plush/jquery.ui.dialog.js
-* debian/missing-sources/Plush/jquery.ui.mouse.js
-* debian/missing-sources/Plush/jquery.ui.selectable.js
-* debian/missing-sources/Plush/jquery.ui.draggable.js
-* debian/missing-sources/Plush/jquery.ui.resizable.js
-* debian/missing-sources/Plush/jquery.ui.position.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.core.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.widget.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.tabs.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.button.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.dialog.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.mouse.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.selectable.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.draggable.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.resizable.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.ui.position.js
 	Copyright (C) 2011 by AUTHORS.txt (http://jqueryui.com/about)
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Plush/jquery.colorbox_1.3.17.2.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.colorbox_1.3.17.2.js
 	Copyright (C) 2010 by Jack Moore <jack at colorpowered.com>
 License: MIT
 
 
-* debian/missing-sources/Plush/jquery.cookie_1.0.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.cookie_1.0.js
 	Copyright (C) 2006 by Klaus Hartl (stilbuero.de)
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Plush/jquery.hoverIntent.r5.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.hoverIntent.r5.js
 	Copyright (C) 2007 by Brian Cherne <brian at cherne.net>
 License: dual-licensed MIT, GPL-2
 
 
-*debian/missing-sources/Plush/jquery.livequery_1.1.1.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.livequery_1.1.1.js
 	Copyright (C) 2010 by Brandon Aaron
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Plush/jquery.superfish_1.4.8.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.superfish_1.4.8.js
 	Copyright (C) 2008 by Joel Birch
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Plush/jquery.tablednd.0.5.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.tablednd.0.5.js
 	Copyright (C) 2008 by Denis Howlett <denish at isocra.com>
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/Plush/webtoolkit.aim.js
+* interfaces/Plush/templates/static/javascripts/src/webtoolkit.aim.js
 	Copyright (C) 2006-2008 by www.webtoolkit.info
 License: GPL-3+
 
 
-* debian/missing-sources/Plush/jquery.rateit.js
+* interfaces/Plush/templates/static/javascripts/src/jquery.rateit.js
 	Copyright (C) 2013 Gideon Junge
 License: MIT
 
 
-* debian/missing-sources/wizard/jquery-1.3.js
+* interfaces/wizard/static/javascript/src/jquery-1.3.js
 	Copyright (C) 2009 by John Resig
 License: dual-licensed MIT, GPL-2
 
 
-* debian/missing-sources/wizard/sizzle.js
+* interfaces/wizard/static/javascript/src/sizzle.js
 	Copyright (C) 2009 by The Dojo Foundation
 License: triple-licensed MIT, BSD-sizzle, GPL-2
 

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/rules	2015-10-13 21:11:46 UTC (rev 12486)
@@ -35,7 +35,8 @@
 		--exclude=images-split.tar.gz \
 		--exclude=cherrypy/LICENSE.txt \
 		--exclude=cherrypy/cherryd \
-		--exclude=cherrypy/scaffold
+		--exclude=cherrypy/scaffold \
+		--exclude=/src/
 	mv $(DESTDIR)/usr/bin/SABnzbd.py $(DESTDIR)/usr/bin/sabnzbdplus
 
 override_dh_installchangelogs:
@@ -47,3 +48,34 @@
 
 override_dh_installinit:
 	dh_installinit -- defaults 98 02
+
+
+DEB_DIR := $(abspath $(dir $(MAKEFILE_LIST)))
+DEB_SRC := $(shell dpkg-parsechangelog -l$(DEB_DIR)/changelog --show-field Source)
+DEB_TAG := +dfsg
+# clean upstream version
+UPS_VER := $(shell dpkg-parsechangelog -l$(DEB_DIR)/changelog --show-field Version | sed 's/.*://; s/-[^-]*$$//; s/\+.*//')
+# basedir in upstream tarball
+UPS_DIR := SABnzbd-$(UPS_VER)
+
+get-orig-source:
+	# todo:
+	#	replace missing-sources with local overlay dir and move out of ./debian subdir on cvs, adjust svn co below
+	#
+	# download, decompress and rename sources from upstream
+	uscan --noconf --force --verbose --rename --check-dirname-level=0 --destdir=$(CURDIR) --download-version $(UPS_VER)
+	gunzip $(DEB_SRC)_$(UPS_VER).orig.tar.gz
+	mv $(DEB_SRC)_$(UPS_VER).orig.tar $(DEB_SRC)_$(UPS_VER)$(DEB_TAG).orig.tar
+	# download the missing source files from cvs
+
+	### TMP: use local copy
+	### svn export --non-interactive svn://anonscm.debian.org/python-apps/packages/sabnzbdplus/trunk/debian/missing-sources $(CURDIR)/$(UPS_DIR)
+	mkdir -p $(CURDIR)/$(UPS_DIR) && cp -r $(CURDIR)/../overlay-missing-sources/* $(CURDIR)/$(UPS_DIR)/
+
+	# but... will it blend?
+	tar --append --owner=root --group=root --mode=a+rX --file $(DEB_SRC)_$(UPS_VER)$(DEB_TAG).orig.tar $(UPS_DIR)
+	# make room
+	rm -f $(DEB_SRC)_$(UPS_VER)$(DEB_TAG).orig.tar.gz
+	gzip --best $(DEB_SRC)_$(UPS_VER)$(DEB_TAG).orig.tar
+	# remove leftovers
+	rm -rf $(UPS_DIR)

Modified: packages/sabnzbdplus/trunk/debian/source/lintian-overrides
===================================================================
--- packages/sabnzbdplus/trunk/debian/source/lintian-overrides	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/source/lintian-overrides	2015-10-13 21:11:46 UTC (rev 12486)
@@ -1,5 +1,9 @@
 # Inclusion of prebuilt js files by upstream is intentional
 sabnzbdplus source: source-contains-prebuilt-javascript-object *
 
-# Sources aren't missing for files in debian/missing-sources/
-sabnzbdplus source: source-is-missing debian/missing-sources/*
+# Sources aren't missing for maintainer-added files, these are all
+# false positives from a simplistic lintian check based on line
+# lengths of .js files.
+sabnzbdplus source: source-is-missing interfaces/Config/templates/staticcfg/js/src/*
+sabnzbdplus source: source-is-missing interfaces/Plush/templates/static/javascripts/src/*
+

Modified: packages/sabnzbdplus/trunk/debian/watch
===================================================================
--- packages/sabnzbdplus/trunk/debian/watch	2015-10-13 21:06:51 UTC (rev 12485)
+++ packages/sabnzbdplus/trunk/debian/watch	2015-10-13 21:11:46 UTC (rev 12486)
@@ -1,3 +1,4 @@
 # works only for full versions, not for betas or candidate releases
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://sf.net/sabnzbdplus/SABnzbd-([\d\.]*)-src\.tar\.gz

More information about the Python-apps-commits mailing list