[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-46-g7a39a8e

David Paleino dapal at debian.org
Sat Mar 10 22:21:06 UTC 2012


The following commit has been merged in the master branch:
commit 7a39a8ef5bf96c4b364734b56e1f3b958c554bdb
Author: David Paleino <dapal at debian.org>
Date:   Sat Mar 10 23:21:02 2012 +0100

    Added README.source explaining the reason for repacking the tarball

diff --git a/debian/README.source b/debian/README.source
index 4d20f67..5708349 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,8 @@
+OpenJPEG for Debian
+-------------------
 
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-Please see /usr/share/doc/dpatch/README.source(.gz) for a detailed explanation.
+The original tarball has been repacked to remove third-party libraries
+present in thirdparty/. The Debian package has been compiled using
+system-wide libraries instead.
 
+ -- David Paleino <dapal at debian.org>  Sat, 10 Mar 2012 23:20:31 +0100
diff --git a/debian/changelog b/debian/changelog
index cf62fd1..488c594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ openjpeg (1.5.0-1) UNRELEASED; urgency=low
   * Fix a crash path in openjpeg that was identified when placing the
     lib under load
   * Place -dbg package in section debug
-  * Implement a README.source
   * Bump standards version as we are bringing the package up to latest
     spec
   * Fix alpha channel encode by preventing an overrun in the static MCT
@@ -23,8 +22,9 @@ openjpeg (1.5.0-1) UNRELEASED; urgency=low
   * Patches converted from dpatch to quilt-format
   * Dropped unapplicable patches with the new sources
   * Updated debian/copyright (missing bits and DEP-5)
+  * Added README.source explaining the reason for repacking the tarball
 
- -- David Paleino <dapal at debian.org>  Sat, 10 Mar 2012 23:07:09 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 10 Mar 2012 23:19:05 +0100
 
 openjpeg (1.3+dfsg-4) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index 37450a5..4fd1e15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CURVER := $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}' | cut -d- -f1 | cut -d+ -f1)
+
 %:
 	dh $@
 
 .PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip -plibopenjpeg2 --dbg-package=libopenjpeg2-dbg
+
+get-orig-source:
+	uscan --verbose \
+		--force-download \
+		--download-version $(CURVER) \
+		--rename \
+		--destdir .
+	tar xf openjpeg_$(CURVER).orig.tar.gz
+	rm -rf openjpeg-$(CURVER)/thirdparty/
+	tar cf openjpeg_$(CURVER)+ds.orig.tar openjpeg-$(CURVER)/
+	gzip -9 openjpeg_$(CURVER)+ds.orig.tar
+	rm -rf openjpeg-$(CURVER)/ openjpeg_$(CURVER).orig.tar.gz
diff --git a/debian/watch b/debian/watch
index dcbb3e5..545e8a2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,5 @@
 # Compulsory line, this is a version 3 file
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=dversionmangle=s/\+d.*// \
 http://code.google.com/p/openjpeg/downloads/list?can=1 \
 		       .*/files/openjpeg-([0-9_.]+)\.tar\.gz
-

-- 
openjpeg packaging



More information about the Pkg-phototools-commits mailing list