[Pkg-javascript-commits] [jquery-mobile] 02/02: Align everything in debian/ with new packaging.

Sun Jan 22 13:44:32 UTC 2017

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository jquery-mobile.

commit cc173d90be837e7c3c732c2fbfec52996136e858
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Jan 22 14:36:17 2017 +0100

    Align everything in debian/ with new packaging.
---
 debian/README.Debian |  3 +++
 debian/changelog     | 11 +++++++++--
 debian/compat        |  2 +-
 debian/control       | 12 ++++++------
 debian/copyright     | 18 ++++++++----------
 debian/rules         | 37 ++++++++++++-------------------------
 6 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index cd44dc5..28e3afa 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -45,5 +45,8 @@ Explain why dfsg-packaging
 jQuery Mobile originally comes with minified files. However, it violates
 the Debian Policy.
 
+Additionally, code copies of jQuery and jQury Mobil itself have been
+removed from the demos.
+
 
  -- Marcelo Jorge Vieira <metal at debian.org>  Sun, 20 May 2012 18:04:18 -0300
diff --git a/debian/changelog b/debian/changelog
index 518f012..8742482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 jquery-mobile (1.4.5+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release. (Closes: #734101)
-
- -- Dominik George <nik at naturalnet.de>  Sun, 22 Jan 2017 14:21:59 +0100
+  * Raise compat level and Standards-Version.
+  * Update and fix debian/copyright.
+  * Remove get-orig-source; instead, use uscan and Files-Excluded.
+  * Update VCS-URLs.
+    + Source repository now uses pristine-tar.
+  * Depend on jQuery >= 1.8 because that is what upstream says.
+  * Add myself to Uploaders.
+
+ -- Dominik George <nik at naturalnet.de>  Sun, 22 Jan 2017 14:37:49 +0100
 
 jquery-mobile (1.2.0+dfsg-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index c8ff48d..570fbe7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Marcelo Jorge Vieira (metal) <metal at debian.org>
  Dominik George <nik at naturalnet.de>
-Build-Depends: debhelper (>= 7.0.50~), yui-compressor
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 10~), yui-compressor
+Standards-Version: 3.9.8
 Homepage: http://jquerymobile.com/
-Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery-mobile.git
-Vcs-Git: git://git.debian.org/git/pkg-javascript/jquery-mobile.git
+Vcs-Browser: http://anonscm.debian.org/git/pkg-javascript/jquery-mobile.git
+Vcs-Git: http://anonscm.debian.org/git/pkg-javascript/jquery-mobile.git
 
 Package: libjs-jquery-mobile
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery (>= 1.7.1)
+Depends: ${misc:Depends}, libjs-jquery (>= 1.8)
 Recommends: javascript-common
 Description: Touch-Optimized Web Framework for Smartphones & Tablets
  A unified, HTML5-based user interface system for all popular mobile
@@ -23,7 +23,7 @@ Description: Touch-Optimized Web Framework for Smartphones & Tablets
 Package: libjs-jquery-mobile-docs
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery (>= 1.7.1), libjs-jquery-mobile
+Depends: ${misc:Depends}, libjs-jquery (>= 1.8), libjs-jquery-mobile
 Recommends: javascript-common
 Description: Documentation for jQuery Mobile
  A unified, HTML5-based user interface system for all popular mobile
diff --git a/debian/copyright b/debian/copyright
index 70324f4..a651c6a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,11 @@ Files-Excluded: *.min.*
  demos/js
 
 Files: *
-Copyright: 2011, jQuery Project
-License: GPL-2 or MIT
-
-Files: jquery.mobile.js
-Copyright: 2011, jQuery Project
-           2012, AUTHORS.txt (http://jqueryui.com/about)
-           2010, "Cowboy" Ben Alman
-License: GPL-2 or MIT
+Copyright: 2010, 2014 jQuery Foundation, Inc. and othercontributors
+License: Expat
+Comment: The license referred to in the code at http://jquery.com/license
+ has vanished, but it used to be MIT/Expat and as the code comments
+ still refer to MIT this will certainly not have changed.
 
 Files: demos/docs/toolbars/glyphish-icons/*
 Copyright: Joseph Wain (see http://penandthink.com)
@@ -22,13 +19,14 @@ Comment: http://glyphish.com
 
 Files: debian/*
 Copyright: 2012, Marcelo Jorge Vieira <metal at debian.org>
-License: GPL-2 or MIT
+ 2017, Dominik George <nik at naturalnet.de>
+License: GPL-2 or Expat
 
 License: GPL-2
  On Debian systems the full text of the GNU General Public License can be found
  in the `/usr/share/common-licenses/GPL-2' file.
 
-License: MIT
+License: Expat
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
   "Software"), to deal in the Software without restriction, including
diff --git a/debian/rules b/debian/rules
index a72db67..021b905 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,14 @@ override_dh_auto_build:
 	ln -s $$(basename jquery.mobile.structure-*.min.css) jquery.mobile.structure.min.css
 	ln -s $$(basename jquery.mobile.theme-*.css) jquery.mobile.theme.css
 	ln -s $$(basename jquery.mobile.theme-*.min.css) jquery.mobile.theme.min.css
+	ln -s $$(basename jquery.mobile.inline-svg-*.css) jquery.mobile.inline-svg.css
+	ln -s $$(basename jquery.mobile.inline-svg-*.min.css) jquery.mobile.inline-svg.min.css
+	ln -s $$(basename jquery.mobile.inline-png-*.css) jquery.mobile.inline-png.css
+	ln -s $$(basename jquery.mobile.inline-png-*.min.css) jquery.mobile.inline-png.min.css
+	ln -s $$(basename jquery.mobile.external-png-*.css) jquery.mobile.external-png.css
+	ln -s $$(basename jquery.mobile.external-png-*.min.css) jquery.mobile.external-png.min.css
+	ln -s $$(basename jquery.mobile.icons-*.css) jquery.mobile.icons.css
+	ln -s $$(basename jquery.mobile.icons-*.min.css) jquery.mobile.icons.min.css
 
 override_dh_installdocs:
 	dh_installdocs
@@ -32,29 +40,8 @@ override_dh_auto_clean:
 	rm -f jquery.mobile.css
 	rm -f jquery.mobile.structure.css
 	rm -f jquery.mobile.theme.css
+	rm -f jquery.mobile.inline-png.css
+	rm -f jquery.mobile.inline-svg.css
+	rm -f jquery.mobile.external-png.css
+	rm -f jquery.mobile.icons.css
 	dh_auto_clean
-
-get-orig-source:
-	OUTDIR=$$PWD ; \
-	MAKEFILE=`echo $(MAKEFILE_LIST) | awk '{ print $$1 }'` ; \
-	FILE=`readlink -f $$MAKEFILE` ; \
-	DIR=`dirname $$FILE` ; \
-	cd $$DIR/.. ; \
-	TMP=`mktemp -d` ; \
-	if ! USCAN=`uscan --destdir $$TMP` ; then exit 1 ; fi ; \
-	VERSION=`echo $$USCAN | sed -n 's/.*Newer version (\(.*\)) available.*/\1/p'` ; \
-	cd $$TMP ; \
-	unzip -o -q jquery.mobile-$$VERSION.zip; \
-	mv jquery.mobile-$$VERSION jquery-mobile-$$VERSION; \
-	cd jquery-mobile-$$VERSION ; \
-	rm -f *.min.* ; \
-	rm -f demos/css/themes/default/*.min.* ; \
-	rm -f demos/js/jquery.js ; \
-	rm -r demos/js/*.min.* ; \
-	cd .. ; \
-	tar c jquery-mobile-$$VERSION | gzip -9 > jquery-mobile_$$VERSION+dfsg.orig.tar.gz ; \
-	rm -rf jquery-mobile-$$VERSION ; \
-	mv jquery-mobile_$$VERSION+dfsg.orig.tar.gz $$OUTDIR ; \
-	cd $$OUTDIR ; \
-	rm -rf $$TMP ; \
-	echo Saved file at jquery-mobile_$$VERSION+dfsg.orig.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/jquery-mobile.git

