Binary files /tmp/ZfoQf6a_TF/libocas-0.97/data/lena.jpg and /tmp/RhKc4nhPYr/libocas-0.97+dfsg/data/lena.jpg differ
diff -Nru libocas-0.97/debian/changelog libocas-0.97+dfsg/debian/changelog
--- libocas-0.97/debian/changelog	2014-08-26 02:38:15.000000000 +0000
+++ libocas-0.97+dfsg/debian/changelog	2015-07-11 15:13:41.000000000 +0000
@@ -1,3 +1,24 @@
+libocas (0.97+dfsg-1) unstable; urgency=medium
+
+  * Rebase packaging on DFSG-cleaned upstream source.
+  * debian/control:
+    - Bump Standards-Version to 3.9.6 (no changes needed)
+    - Drop XS-Testsuite. dpkg now recognizes the Testsuite header, and
+      dpkg-source automatically adds one when an autopkgtest suite is found
+  * debian/rules:
+    - Improve version information extraction
+    - Add a git-orig-source target that DFSG-cleans. The DFSG-cleaning is
+      performed by uscan with the Files-Excluded header. However, as this
+      header is not yet part of the official MRCF, it is placed in a separate
+      file 'debian/files-excluded'
+  * debian/copyright:
+    - Document the DFSG-cleaning actions
+    - Bump copyright years
+  * debian/watch:
+    - Adjust for DFSG-cleaned upstream source
+
+ -- Christian Kastner <debian@kvr.at>  Sat, 11 Jul 2015 17:05:39 +0200
+
 libocas (0.97-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libocas-0.97/debian/control libocas-0.97+dfsg/debian/control
--- libocas-0.97/debian/control	2014-08-26 02:38:15.000000000 +0000
+++ libocas-0.97+dfsg/debian/control	2015-07-11 15:13:41.000000000 +0000
@@ -4,8 +4,7 @@
 Maintainer: Christian Kastner <debian@kvr.at>
 Build-Depends:
     debhelper (>= 9)
-Standards-Version: 3.9.5
-XS-Testsuite: autopkgtest
+Standards-Version: 3.9.6
 Homepage: http://cmp.felk.cvut.cz/~xfrancv/ocas/html/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/libocas.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libocas.git
diff -Nru libocas-0.97/debian/copyright libocas-0.97+dfsg/debian/copyright
--- libocas-0.97/debian/copyright	2014-08-26 02:38:15.000000000 +0000
+++ libocas-0.97+dfsg/debian/copyright	2015-07-11 15:13:41.000000000 +0000
@@ -2,6 +2,9 @@
 Upstream-Name: LIBOCAS
 Upstream-Contact: Vojtech Franc <xfrancv@cmp.felk.cvut.cz>
 Source: http://cmp.felk.cvut.cz/~xfrancv/ocas/
+Comment:
+ The ubuquitous copy of the 'Lena' image is non-free, and has therefore been
+ removed from this source.
 
 Files: *
 Copyright: 2008-2010, Vojtech Franc <xfrancv@cmp.felk.cvut.cz>
@@ -22,7 +25,7 @@
  `/usr/share/common-licenses/GPL-3'.
 
 Files: debian/*
-Copyright: 2010-2014, Christian Kastner <debian@kvr.at>
+Copyright: 2010-2015, Christian Kastner <debian@kvr.at>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru libocas-0.97/debian/files-excluded libocas-0.97+dfsg/debian/files-excluded
--- libocas-0.97/debian/files-excluded	1970-01-01 00:00:00.000000000 +0000
+++ libocas-0.97+dfsg/debian/files-excluded	2015-07-11 15:13:41.000000000 +0000
@@ -0,0 +1,5 @@
+# This is used by uscan during repacking in the get-orig-source target. As this
+# is not yet part of the MRCF, it is kept separately from debian/copyright.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files-Excluded:
+    data/lena.jpg
diff -Nru libocas-0.97/debian/rules libocas-0.97+dfsg/debian/rules
--- libocas-0.97/debian/rules	2014-08-26 02:38:15.000000000 +0000
+++ libocas-0.97+dfsg/debian/rules	2015-07-11 15:13:41.000000000 +0000
@@ -4,10 +4,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Get version numbers for SONAME from changelog
-DVER = $(shell dpkg-parsechangelog | grep '^Version')
-LVER = $(shell echo $(DVER) | sed -e 's/Version: \([0-9]*\)\..*/\1/')
-LSUBVER = $(shell echo $(DVER) | sed -e 's/Version: .*\.\([0-9]*\).*/\1/')
+# Get version information
+PKGDIR := $(dir $(firstword $(MAKEFILE_LIST)))..
+UPVER := $(shell dpkg-parsechangelog -l$(PKGDIR)/debian/changelog -S Version | \
+		sed -re 's/\+dfsg-.*//')
+LVER = $(shell echo $(UPVER) | sed -nre 's/([0-9]+)\..*/\1/p')
+LSUBVER = $(shell echo $(UPVER) | sed -nre 's/[0-9]\.([0-9]+).*/\1/p')
 export LVER
 export LSUBVER
 
@@ -31,3 +33,18 @@
 
 override_dh_strip:
 	dh_strip --dbg-package=libocas-dbg
+
+
+# Remove upstream's non-DFSG-compliant files
+get-orig-source:
+	uscan \
+		--noconf \
+		--download-version $(UPVER) \
+		--force-download \
+		--check-dirname-level=0 \
+		--destdir=$(CURDIR) \
+		--rename \
+		--repack \
+		--compression xz \
+		--copyright-file=$(PKGDIR)/debian/files-excluded \
+		$(PKGDIR)
diff -Nru libocas-0.97/debian/watch libocas-0.97+dfsg/debian/watch
--- libocas-0.97/debian/watch	2014-08-26 02:38:15.000000000 +0000
+++ libocas-0.97+dfsg/debian/watch	2015-07-11 15:13:41.000000000 +0000
@@ -1,4 +1,4 @@
 version=3
 
-opts=uversionmangle=s/^0/0\./ \
+opts=uversionmangle=s/^0/0\./,dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
 http://cmp.felk.cvut.cz/~xfrancv/ocas/libocas_v(.*).zip