On 11.08.2013 00:20, Sebastian Ramacher wrote: Thanks for reviewing the debdiff.
> On 2013-08-10 19:58:41, Andreas Moog wrote: >> diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links >> twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links >> --- twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links >> 2013-06-08 21:01:56.000000000 +0000 >> +++ twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links >> 2013-08-10 19:27:34.000000000 +0000 >> @@ -1,4 +1,4 @@ >> -/usr/share/twitter-bootstrap/apache2.conf >> /etc/apache2/conf.d/twitter-bootstrap.conf >> +/usr/share/twitter-bootstrap/apache2.conf >> /etc/apache2/conf.available/libjs-twitter-bootstrap.conf >> /usr/share/twitter-bootstrap/files >> /usr/share/javascript/twitter-bootstrap > > This should be /etc/apache2/conf-available instead. Ups, you are right. > Otherwise the upload looks good to me. If you send me an updated > debdiff with the one issue fixed, I'm happy to upload the package for > you. Updated debdiff attached, thank you for sponsoring this! Cheers, Andreas
diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/changelog twitter-bootstrap-2.0.2+dfsg/debian/changelog --- twitter-bootstrap-2.0.2+dfsg/debian/changelog 2013-06-08 23:26:30.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/changelog 2013-08-10 21:55:34.000000000 +0200 @@ -1,3 +1,17 @@ +twitter-bootstrap (2.0.2+dfsg-4) unstable; urgency=low + + * QA upload. + * debian/patches/build-with-node-1.4.2.patch: Add patch from upstream + git to build with node 1.4.2 (Closes: #718072) + * Updating to Standards version 3.9.4 + * Update copyright file to clarify license + * Include a watchfile + * Don't duplicate "Section"-field in libjs-twitter-bootstrap + * Don't use obsolete Apache2 conf.d directory + * Add a doc-base file for the documentation package + + -- Andreas Moog <am...@ubuntu.com> Sat, 10 Aug 2013 18:57:51 +0000 + twitter-bootstrap (2.0.2+dfsg-3) unstable; urgency=low * QA upload diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/control twitter-bootstrap-2.0.2+dfsg/debian/control --- twitter-bootstrap-2.0.2+dfsg/debian/control 2013-06-08 23:14:07.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/control 2013-08-10 21:21:46.000000000 +0200 @@ -2,14 +2,15 @@ Section: web Priority: optional Maintainer: Debian QA Group <packa...@qa.debian.org> -Build-Depends: - debhelper (>= 9), node-less (>= 1.3), node-uglify, yui-compressor, - zip -Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), + node-less (>= 1.3), + node-uglify, + yui-compressor, + zip +Standards-Version: 3.9.4 Homepage: http://twitter.github.com/bootstrap/ Package: libjs-twitter-bootstrap -Section: web Architecture: all Depends: ${misc:Depends} Recommends: libjs-jquery, libjs-jquery-tablesorter diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/copyright twitter-bootstrap-2.0.2+dfsg/debian/copyright --- twitter-bootstrap-2.0.2+dfsg/debian/copyright 2013-06-08 23:01:56.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/copyright 2013-08-10 21:12:51.000000000 +0200 @@ -18,7 +18,7 @@ Files: js/tests/vendor/qunit.* Copyright: John Resig Jörn Zaefferer -License: MIT | GPL-2 +License: MIT or GPL-2 Files: debian/* Copyright: 2011-2012 Daniel Baumann <daniel.baum...@progress-technologies.net> @@ -27,7 +27,7 @@ Files: debian/local/html5shiv/* Copyright: 2011 Alexander Farkas <i...@corrupt-system.de> 2011 Jonathan Neal <jonathantn...@hotmail.com> -License: MIT | GPL-2 +License: MIT or GPL-2 Files: debian/local/prettify/* Copyright: 2006-2011 Google Inc. diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap-docs.doc-base twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap-docs.doc-base --- twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap-docs.doc-base 1970-01-01 01:00:00.000000000 +0100 +++ twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap-docs.doc-base 2013-08-10 21:40:43.000000000 +0200 @@ -0,0 +1,9 @@ +Document: libjs-twitter-bootstrap +Title: twitter-bootstrap CSS - Documentation +Author: Made at Twitter +Abstract: Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjs-twitter-bootstrap-docs/html/index.html +Files: /usr/share/doc/libjs-twitter-bootstrap-docs/html/* diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.install twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.install --- twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.install 2013-06-08 23:01:56.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.install 2013-08-10 21:08:35.000000000 +0200 @@ -1,6 +1,6 @@ -bootstrap/* /usr/share/twitter-bootstrap/files -js/bootstrap*.js /usr/share/twitter-bootstrap/files/js -docs/assets/img/icon-*.png /usr/share/twitter-bootstrap/files/img +bootstrap/* /usr/share/twitter-bootstrap/files debian/local/*.conf /usr/share/twitter-bootstrap debian/local/*/ /usr/share/twitter-bootstrap/files +docs/assets/img/icon-*.png /usr/share/twitter-bootstrap/files/img +js/bootstrap*.js /usr/share/twitter-bootstrap/files/js diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links --- twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links 2013-06-08 23:01:56.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/libjs-twitter-bootstrap.links 2013-08-11 00:29:07.000000000 +0200 @@ -1,4 +1,4 @@ -/usr/share/twitter-bootstrap/apache2.conf /etc/apache2/conf.d/twitter-bootstrap.conf +/usr/share/twitter-bootstrap/apache2.conf /etc/apache2/conf-available/libjs-twitter-bootstrap.conf /usr/share/twitter-bootstrap/files /usr/share/javascript/twitter-bootstrap /usr/share/javascript/jquery/jquery.js /usr/share/twitter-bootstrap/files/jquery/jquery.js diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/patches/build-with-node-1.4.2.patch twitter-bootstrap-2.0.2+dfsg/debian/patches/build-with-node-1.4.2.patch --- twitter-bootstrap-2.0.2+dfsg/debian/patches/build-with-node-1.4.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ twitter-bootstrap-2.0.2+dfsg/debian/patches/build-with-node-1.4.2.patch 2013-08-10 21:00:46.000000000 +0200 @@ -0,0 +1,49 @@ +Description: Move to new selector interpolation, supported from node 1.3.1 + onwards, this fixes a build error with node 1.4.2 +Author: Luke Page <luke.a.p...@gmail.com> +Bug-Debian: http://bugs.debian.org/718072 +Origin: upstream, https://github.com/twbs/bootstrap/commit/042bb9b51510573a9a1db6bc66cb16311d0d580b.patch +Last-Update: 2013-08-10 + +--- twitter-bootstrap-2.0.2+dfsg.orig/less/mixins.less ++++ twitter-bootstrap-2.0.2+dfsg/less/mixins.less +@@ -519,13 +519,13 @@ + .core (@gridColumnWidth, @gridGutterWidth) { + + .spanX (@index) when (@index > 0) { +- (~".span@{index}") { .span(@index); } ++ .span@{index} { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} + + .offsetX (@index) when (@index > 0) { +- (~".offset@{index}") { .offset(@index); } ++ .offset@{index} { .offset(@index); } + .offsetX(@index - 1); + } + .offsetX (0) {} +@@ -562,7 +562,7 @@ + .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { + + .spanX (@index) when (@index > 0) { +- (~"> .span@{index}") { .span(@index); } ++ .span@{index} { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} +@@ -591,7 +591,7 @@ + .input(@gridColumnWidth, @gridGutterWidth) { + + .spanX (@index) when (@index > 0) { +- (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); } ++ input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} +@@ -610,5 +610,4 @@ + .spanX (@gridColumns); + + } +- + } diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/patches/series twitter-bootstrap-2.0.2+dfsg/debian/patches/series --- twitter-bootstrap-2.0.2+dfsg/debian/patches/series 2013-06-08 23:06:17.000000000 +0200 +++ twitter-bootstrap-2.0.2+dfsg/debian/patches/series 2013-08-10 21:01:16.000000000 +0200 @@ -1,3 +1,4 @@ 01-dfsg.patch 02-build.patch use-nodejs-command.patch +build-with-node-1.4.2.patch diff -Nru twitter-bootstrap-2.0.2+dfsg/debian/watch twitter-bootstrap-2.0.2+dfsg/debian/watch --- twitter-bootstrap-2.0.2+dfsg/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ twitter-bootstrap-2.0.2+dfsg/debian/watch 2013-08-10 21:20:40.000000000 +0200 @@ -0,0 +1,4 @@ +version=3 +opts=uversionmangle=s/-(rc\d*)$/~$1/,dversionmangle=s/\+dfsg\d*$// \ +https://github.com/twbs/bootstrap/releases \ +.*[^n]/(?:|v|r|REL_|rel-|twitter-bootstrap(?:_|-))(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
signature.asc
Description: OpenPGP digital signature
