[SCM] eq10q/master: Use copyright file for repacking.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Dec 13 08:09:40 UTC 2016


The following commit has been merged in the master branch:
commit 0987c69c24fb948bfcd2d5bdb6a1e1bcf35addbb
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Dec 13 09:09:32 2016 +0100

    Use copyright file for repacking.

diff --git a/debian/copyright b/debian/copyright
index e35ee81..d609475 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,11 @@ Upstream-Name: EQ10Q
 Upstream-Contact: Pere Ràfols Soler <sapista2 at gmail.com>
 Source: http://sourceforge.net/projects/eq10q/files/
 Copyright: 2009-2012, Pere Ràfols Soler <sapista2 at gmail.com>
+Files-Excluded:
+ .svn/*
+ .kdev4/*
+ *.kdev4
+
 
 Files: *
 Copyright: 2009-2012, Pere Ràfols Soler <sapista2 at gmail.com>
diff --git a/debian/rules b/debian/rules
index 6311554..1b32d95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Path to the debian directory
-DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
-UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-DFSG = repack0
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 LDFLAGS+=-Wl,--as-needed
@@ -15,15 +10,3 @@ LDFLAGS+=-Wl,--as-needed
 
 override_dh_installchangelogs:
 	dh_installchangelogs README
-
-get-orig-source:
-	cd $(DEBIAN_DIR)/.. && uscan --force-download
-	tar xf ../eq10q-$(UPSTREAM_VERSION).tar.gz
-	rm ../eq10q-$(UPSTREAM_VERSION).tar.gz \
-	../eq10q_$(UPSTREAM_VERSION).orig.tar.gz
-	mv eq10q-$(UPSTREAM_VERSION) eq10q-$(UPSTREAM_VERSION)~$(DFSG)
-	tar cf ../eq10q_$(UPSTREAM_VERSION)~$(DFSG).orig.tar \
-	--exclude=.kdev4 eq10q-$(UPSTREAM_VERSION)~$(DFSG) \
-	--exclude-vcs
-	xz -zf ../eq10q_$(UPSTREAM_VERSION)~$(DFSG).orig.tar
-	rm -rf eq10q-$(UPSTREAM_VERSION)~$(DFSG)
diff --git a/debian/watch b/debian/watch
index 2846243..793a1a6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/~repack0.*// \
+opts=dversionmangle=s/~repack0.*//,repacksuffix=~repack0 \
 http://sf.net/eq10q/eq10q-(.*)\.tar\.gz

-- 
eq10q packaging



More information about the pkg-multimedia-commits mailing list