[SCM] libdvdcss-pkg/master: rename package; update package description
onlyjob at users.alioth.debian.org
onlyjob at users.alioth.debian.org
Sat May 11 02:16:11 UTC 2013
The following commit has been merged in the master branch:
commit fc89afc7ad163defc5bceffa3d52d6fba25f4112
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat May 11 10:49:58 2013 +1000
rename package; update package description
diff --git a/debian/README.Debian b/debian/README.Debian
index db4c7c2..e92065d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,7 +24,7 @@ Implementation:
* If user choose to remove "guest" package, debconf configuration
will be updated to prevent re-installation of "guest" packages.
- * "dpkg-reconfigure libdvdcss-pkg" may be used to build and install
+ * "dpkg-reconfigure libdvd-pkg" may be used to build and install
guest packages. Otherwise guest package(s) will be built and installed
from DPKG post-invoke handler. Although automated, unfortunately this
will delay installation till next apt-get operation. Is there a better
diff --git a/debian/b-i_libdvdcss.sh b/debian/b-i_libdvdcss.sh
index 6b675da..b8b542a 100755
--- a/debian/b-i_libdvdcss.sh
+++ b/debian/b-i_libdvdcss.sh
@@ -3,9 +3,9 @@
# Source debconf library.
. /usr/share/debconf/confmodule
db_version 2.0
-db_get libdvdcss-pkg/build
+db_get libdvd-pkg/build
-PKGI="libdvdcss-pkg"
+PKGI="libdvd-pkg"
DIR="/usr/src/${PKGI}"
PKGG="libdvdcss2"
PKGG_ALL="libdvdcss2 libdvdcss-dev"
diff --git a/debian/changelog b/debian/changelog
index 9b46434..5e43271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdvdcss-pkg (1.2.13-1) unstable; urgency=low
+libdvd-pkg (1.2.13-1) unstable; urgency=low
* First release (Closes: #687624).
diff --git a/debian/config b/debian/config
index ae53d18..e249618 100644
--- a/debian/config
+++ b/debian/config
@@ -6,10 +6,10 @@ set -e
db_version 2.0
db_capb escape
-db_settitle libdvdcss-pkg/title
+db_settitle libdvd-pkg/title
if [ "$1" = configure ] || [ "$1" = reconfigure ] ; then
- db_input high libdvdcss-pkg/build || true
+ db_input high libdvd-pkg/build || true
db_go || true
fi
diff --git a/debian/control b/debian/control
index a5f2fb0..9240b79 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libdvdcss-pkg
+Source: libdvd-pkg
Section: contrib/utils
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@ -8,15 +8,16 @@ Build-Depends: debhelper (>= 9)
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libdvdcss-pkg.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libdvdcss-pkg.git
-Package: libdvdcss-pkg
+Package: libdvd-pkg
Architecture: all
Depends: ${misc:Depends} ,build-essential
,${guest:Build-Depends}
Recommends: ${guest:Recommends}
Suggests: ${guest:Suggests}
-Description: download, build and install libdvdcss package
- This package will automatically download, build and install
- libdvdcss on your system.
+Description: download and install software necessary to play encrypted DVDs
+ This package fetch, compile from source code and install library
+ packages that are necessary for playing encrypted DVDs with media
+ player of your choice.
.
.
${guest}: ${guest:Description}
diff --git a/debian/install b/debian/install
index 9cd90e6..b7dc23a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-debian/88libdvdcss-pkg /etc/apt/apt.conf.d
-libdvdcss/debian /usr/share/libdvdcss-pkg
-libdvdcss/*.md5 /usr/share/libdvdcss-pkg
-debian/*.sh /usr/lib/libdvdcss-pkg
+debian/88libdvdcss-pkg /etc/apt/apt.conf.d
+libdvdcss/debian /usr/share/libdvd-pkg
+libdvdcss/*.md5 /usr/share/libdvd-pkg
+debian/*.sh /usr/lib/libdvd-pkg
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 342d21f..0000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,44 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: libdvdcss-pkg\n"
-"Report-Msgid-Bugs-To: libdvdcss-pkg at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-22 12:42+1000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: title
-#. Description
-#: ../templates:1001
-msgid "build and install libdvdcss library."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid "are you sure you want to build and install libdvdcss?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid ""
-"Debian is not shipping libdvdcss due to fears of running afoul of DMCA-style "
-"laws."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid "Source files will be downloaded from videolan.org."
-msgstr ""
diff --git a/debian/postinst b/debian/postinst
index e35f561..f8da684 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,9 +8,9 @@ db_version 2.0
case "$1" in
configure*)
- db_get libdvdcss-pkg/build
+ db_get libdvd-pkg/build
if [ "$RET" = "true" ]; then
- /usr/lib/libdvdcss-pkg/b-i_libdvdcss.sh
+ /usr/lib/libdvd-pkg/b-i_libdvdcss.sh
fi
;;
esac
diff --git a/debian/postrm b/debian/postrm
index 70fb582..d1364e9 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -4,10 +4,10 @@ set -e
case "$1" in
purge|abort-install)
- rm -rf /usr/src/libdvdcss-pkg || true
+ rm -rf /usr/src/libdvd-pkg || true
;;
remove)
- rm -rf /usr/src/libdvdcss-pkg/build || true
+ rm -rf /usr/src/libdvd-pkg/build || true
;;
esac
diff --git a/debian/rules b/debian/rules
index b72612b..8a7aafb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,16 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-PKG=libdvdcss-pkg
-PKGG=$(patsubst %-pkg,%,$(PKG))
+PKD = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+PKGG = $(patsubst %-pkg,%,$(PKG))css
%: debian/po/templates.pot
dh $@
override_dh_auto_configure:
## check if "host" and "guest" packages version match
- [ $$(dpkg-parsechangelog | sed -n 's/^Version: *//p') \
+ [ $$(dpkg-parsechangelog -l$(PKD)/changelog | sed -n 's/^Version: *//p') \
= $$(dpkg-parsechangelog -l$(PKGG)/debian/changelog | sed -n 's/^Version: *//p') ]
debian/po/templates.pot:
diff --git a/debian/templates b/debian/templates
index d9bc9fa..83af680 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,12 +1,12 @@
-Template: libdvdcss-pkg/title
+Template: libdvd-pkg/title
Type: title
_Description: build and install libdvdcss library.
-Template: libdvdcss-pkg/build
+Template: libdvd-pkg/build
Type: boolean
Default: false
-_Description: are you sure you want to build and install libdvdcss?
- Debian is not shipping libdvdcss due to fears of running afoul
- of DMCA-style laws.
+_Description: Continue?
+ This application is about to download, compile from source code and
+ install libdvdcss library as Debian package.
.
Source files will be downloaded from videolan.org.
diff --git a/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5 b/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5
index 9e51baa..c3e2fbe 100644
--- a/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5
+++ b/libdvdcss/libdvdcss_1.2.11.orig.tar.bz2.md5
@@ -1 +1 @@
-d25d906c3f9007ccd91b1efb909f93e7 /usr/src/libdvdcss-pkg/libdvdcss_1.2.11.orig.tar.bz2
+d25d906c3f9007ccd91b1efb909f93e7 /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
index e553b21..5af5109 100644
--- a/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.md5
+++ b/libdvdcss/libdvdcss_1.2.12.orig.tar.bz2.md5
@@ -1 +1 @@
-2218a193900e3203aa10dc24cdf54275 /usr/src/libdvdcss-pkg/libdvdcss_1.2.12.orig.tar.bz2
+2218a193900e3203aa10dc24cdf54275 /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
index 7e46952..4f69e28 100644
--- a/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.md5
+++ b/libdvdcss/libdvdcss_1.2.13.orig.tar.bz2.md5
@@ -1 +1 @@
-53cfc52a60a156763c425572e5179273 /usr/src/libdvdcss-pkg/libdvdcss_1.2.13.orig.tar.bz2
+53cfc52a60a156763c425572e5179273 /usr/src/libdvd-pkg/libdvdcss_1.2.13.orig.tar.bz2
--
libdvdcss-pkg packaging
More information about the pkg-multimedia-commits
mailing list