[SCM] libdvdcss-pkg/master: MD5 --> SHA1; correting upstream archive type xz --> bz2

onlyjob at users.alioth.debian.org onlyjob at users.alioth.debian.org
Sat May 25 08:29:55 UTC 2013


The following commit has been merged in the master branch:
commit f0e2c60ac75bf2b4678f2c9e63f48efb1fb4df41
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat May 25 17:03:17 2013 +1000

    MD5 --> SHA1; correting upstream archive type xz --> bz2

diff --git a/debian/README.source b/debian/README.source
index a380586..3f94383 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,7 +5,7 @@ Implementation:
 
  * Package contains "guest" package sources, but not upstream sources.
    Upstream sources will be fetched using "uscan". After download
-   orig.tar integrity is checked with known md5sum
+   orig.tar integrity is checked with known SHA1 digest.
 
  * Host package version (without debian revision) should match version
    of guest package with debian revision.
diff --git a/debian/b-i_libdvdcss.sh b/debian/b-i_libdvdcss.sh
index b1a53b5..fbee030 100755
--- a/debian/b-i_libdvdcss.sh
+++ b/debian/b-i_libdvdcss.sh
@@ -51,7 +51,7 @@ echo "${PKGI}: Downloading orig source..."
 cd ${DIR} \
 && /usr/share/${PKGI}/debian/rules get-orig-source
 echo "${PKGI}: Checking integrity..."
-md5sum --check --strict --quiet /usr/share/${PKGI}/*_${VERGG%%-*}.orig.tar.*.md5 \
+sha1sum --check --strict --quiet /usr/share/${PKGI}/*_${VERGG%%-*}.orig.tar.*.sha1 \
 || (
     rm -fv ${DIR}/*_${VERGG%%-*}.orig.tar.*
     echo "Source archive failed integrity check so it was deleted. Please try again."
diff --git a/debian/install b/debian/install
index da84e5e..313f0a9 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 libdvdcss/debian        /usr/share/libdvd-pkg
-libdvdcss/*.md5         /usr/share/libdvd-pkg
+libdvdcss/*.sha1        /usr/share/libdvd-pkg
 debian/*.sh             /usr/lib/libdvd-pkg
 debian/88libdvdcss-pkg  /etc/apt/apt.conf.d
diff --git a/debian/rules b/debian/rules
index 659edf2..b2014a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,15 +35,15 @@ override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
 .PHONY: get-orig-source
-XZ_FILES=$(notdir $(wildcard $(PKGG)/*.xz))
-MD5_FILES=$(addprefix $(PKGG)/, $(XZ_FILES:.xz=.xz.md5))
+BZ2_FILES=$(notdir $(wildcard $(PKGG)/*.bz2))
+SHA1_FILES=$(addprefix $(PKGG)/, $(BZ2_FILES:.bz2=.bz2.sha1))
 get-orig-source: $(PKG)_$(VER).orig.tar.xz
 	@
 
-$(MD5_FILES):
-	md5sum $(@:.xz.md5=.xz) | sed 's!  .*/!  /usr/src/$(PKG)/!' > $@
+$(SHA1_FILES):
+	sha1sum $(@:.bz2.sha1=.bz2) | sed 's!  .*/!  /usr/src/$(PKG)/!' > $@
 
-$(PKG)_$(VER).orig.tar.xz: $(MD5_FILES)
+$(PKG)_$(VER).orig.tar.xz: $(SHA1_FILES)
 	mkdir $(PKG)_$(VER)
 	cp -r $(PKGG) $(PKG)_$(VER)/
 	XZ_OPT="-6v" tar -caf $(PKG)_$(VER).orig.tar.xz $(PKG)_$(VER) --exclude=*.bz2 --owner=root --group=root --mode=a+rX
diff --git a/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5 b/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5
deleted file mode 100644
index c3e2fbe..0000000
--- a/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-d25d906c3f9007ccd91b1efb909f93e7  /usr/src/libdvd-pkg/libdvdcss_1.2.11.orig.tar.bz2
diff --git a/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.sha1 b/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.sha1
new file mode 100644
index 0000000..ac612a9
--- /dev/null
+++ b/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.sha1
@@ -0,0 +1 @@
+55d75d603071aa4bbcd7a7dcfa63c52dd0e8a104  /usr/src/libdvd-pkg/libdvdcss_1.2.11.orig.tar.bz2
diff --git a/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.md5 b/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.md5
deleted file mode 100644
index 5af5109..0000000
--- a/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-2218a193900e3203aa10dc24cdf54275  /usr/src/libdvd-pkg/libdvdcss_1.2.12.orig.tar.bz2
diff --git a/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.sha1 b/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.sha1
new file mode 100644
index 0000000..2021ae1
--- /dev/null
+++ b/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.sha1
@@ -0,0 +1 @@
+f0977374f12fadbbeb45e1ff493adc259247bb09  /usr/src/libdvd-pkg/libdvdcss_1.2.12.orig.tar.bz2
diff --git a/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.md5 b/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.md5
deleted file mode 100644
index 4f69e28..0000000
--- a/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-53cfc52a60a156763c425572e5179273  /usr/src/libdvd-pkg/libdvdcss_1.2.13.orig.tar.bz2
diff --git a/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.sha1 b/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.sha1
new file mode 100644
index 0000000..c627fec
--- /dev/null
+++ b/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.sha1
@@ -0,0 +1 @@
+1a4a5e55c7529da46386c1c333340eee2c325a77  /usr/src/libdvd-pkg/libdvdcss_1.2.13.orig.tar.bz2

-- 
libdvdcss-pkg packaging



More information about the pkg-multimedia-commits mailing list