Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370840 )

Change subject: Update for real debianizing
......................................................................

Update for real debianizing

Change-Id: I15728c38153ad238ade8e9e4b8f5c8d563633d52
---
M debian/changelog
M debian/control
M debian/copyright
M debian/gbp.conf
A debian/manpages
5 files changed, 30 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/uprightdiff 
refs/changes/40/370840/1

diff --git a/debian/changelog b/debian/changelog
index 9984f20..5263779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-uprightdiff (1.0-1) jessie-wikimedia; urgency=medium
+uprightdiff (1.1.0-1) unstable; urgency=medium
 
-  * Initial Release
+  * Initial Release (Closes: #871533)
 
- -- Kunal Mehta <lego...@member.fsf.org>  Tue, 06 Dec 2016 16:01:21 -0800
+ -- Kunal Mehta <lego...@member.fsf.org>  Tue, 08 Aug 2017 16:28:56 -0400
diff --git a/debian/control b/debian/control
index 4320944..8f6bcd9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Kunal Mehta <lego...@member.fsf.org>
 Build-Depends: debhelper (>= 9), libopencv-highgui-dev, 
libboost-program-options-dev
-Standards-Version: 3.9.8
-Homepage: https://phabricator.wikimedia.org/diffusion/IURD/
-#Vcs-Git: https://anonscm.debian.org/collab-maint/uprightdiff.git
+Standards-Version: 4.0.0
+Homepage: https://www.mediawiki.org/wiki/Uprightdiff
+Vcs-Git: https://gerrit.wikimedia.org/r/p/integration/uprightdiff
 Vcs-Browser: https://phabricator.wikimedia.org/diffusion/IURD/
 
 Package: uprightdiff
diff --git a/debian/copyright b/debian/copyright
index 042d085..34d22d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,31 +13,32 @@
 License: BSD-3-Clause
 
 Files: debian/*
-Copyright: 2016 Kunal Mehta <lego...@member.fsf.org>
+Copyright: 2016-2017 Kunal Mehta <lego...@member.fsf.org>
 License: BSD-3-Clause
 
 License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
+ Redistribution and use in source and binary forms, with or without 
modification,
+ are permitted provided that the following conditions are met:
+ .
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ .
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+  * Neither the names of the copyright holders nor the names of the 
contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ This software is provided by the copyright holders and contributors "as is" 
and
+ any express or implied warranties, including, but not limited to, the implied
+ warranties of merchantability and fitness for a particular purpose are 
disclaimed.
+ In no event shall copyright holders or contributors be liable for any direct,
+ indirect, incidental, special, exemplary, or consequential damages
+ (including, but not limited to, procurement of substitute goods or services;
+ loss of use, data, or profits; or business interruption) however caused
+ and on any theory of liability, whether in contract, strict liability,
+ or tort (including negligence or otherwise) arising in any way out of
+ the use of this software, even if advised of the possibility of such damage.
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 424194d..51715c0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [DEFAULT]
 debian-branch = debian
 sign-tags = true
+upstream-tag = %(version)s
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..7e09ff2
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+uprightdiff.1

-- 
To view, visit https://gerrit.wikimedia.org/r/370840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15728c38153ad238ade8e9e4b8f5c8d563633d52
Gerrit-PatchSet: 1
Gerrit-Project: integration/uprightdiff
Gerrit-Branch: debian
Gerrit-Owner: Legoktm <lego...@member.fsf.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to