debian/changelog

-unarr (0~20150801.d1be8c4-1) unstable; urgency=medium
+unarr (0~20150801.d1be8c4+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #907070)
 

debian/control

@@ -19,13 +19,14 @@ Section: libdevel
 Depends: libunarr1 (= ${binary:Version}),
          ${misc:Depends}
 Description: Decompression library for RAR, TAR, ZIP and 7z archives (devel)
- Development tools: headers and unversioned libraries
- .
  unarr originated as a port of the RAR extraction features from
  The Unarchiver project required for extracting images from comic
  book archives (.cbr). It was written as an alternative to
  libarchive which didn't have support for parsing filters or solid
- compression at the time. .
+ compression at the time
+ .
+ This package contains development tools: headers and unversioned libraries.
+
 
 Package: libunarr1
 Architecture: any
@@ -37,4 +38,6 @@ Description: Decompression library for RAR, TAR, ZIP and 7z archives (runtime)
  The Unarchiver project required for extracting images from comic
  book archives (.cbr). It was written as an alternative to
  libarchive which didn't have support for parsing filters or solid
- compression at the time. This package holds the runtime library.
+ compression at the time
+ . 
+ This package holds the runtime library.

debian/copyright

@@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: unarr
 Upstream-Contact: https://github.com/zeniko/unarr/issues
 Source: https://github.com/zeniko/unarr
+Comment: Source repacked to get rid of upstream crlf line endings.
 
 Files: *
 Copyright: 2015, the unarr project authors (see AUTHORS file).

debian/rules

@@ -13,17 +13,18 @@ override_dh_auto_test:
 
 # Implement get-orig-source to handle upstream's dos line endings.
 VERSION      = $(DEB_VERSION_UPSTREAM)
+BASE_VERSION = $(word 1,$(subst +, ,$(VERSION)))
 
 get-orig-source:
 	rm -rf utmp; mkdir utmp
 	uscan --safe --force-download --compression gzip  --destdir utmp
-	cd utmp; tar xf unarr-$(VERSION).tar.gz
-	cd utmp/unarr-$(VERSION); \
+	cd utmp; tar xf unarr-$(BASE_VERSION).tar.gz
+	cd utmp/unarr-$(BASE_VERSION); \
 	    dos2unix -q $$(find . -name \*.c -o -name \*.h -o -name \*.txt)
 	cd utmp; \
-            mv unarr-$(VERSION) unarr-$(VERSION).orig; \
-	    tar -caf unarr-$(VERSION).orig.tar.gz unarr-$(VERSION).orig
+	    mv unarr-$(BASE_VERSION) unarr-$(VERSION); \
+	    tar -caf unarr-$(VERSION).tar.gz unarr-$(VERSION)
 	mk-origtargz --compression gzip \
                      --rename \
                      --repack \
-            utmp/unarr-$(VERSION).orig.tar.gz && rm -rf utmp
+            utmp/unarr-$(VERSION).tar.gz && rm -rf utmp

debian/watch

 version=4 
 
-opts="mode=git,pretty=0~%cd.%h" https://github.com/zeniko/unarr.git HEAD 
+opts="mode=git,pretty=0~%cd.%h,dversionmangle=s/\+ds$//" \
+    https://github.com/zeniko/unarr.git HEAD 
 
 # Issue asking for release tags: 
 # https://github.com/zeniko/unarr/issues/8