[vdr-plugin-skindesigner] 03/12: Migrating package from yaVDR - General cleanup - Fixed debian/watch (Load releaes from git tags) - Dropped temperatures.frodo - Standards-Version 3.9.6 - Build-Depend vdr-dev >= 2.1.10 - Set maintainer to Debian VDR Team
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sun Feb 15 18:24:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-skindesigner.
commit 854a1b3f295729cf33f5f710b3e0e1c721b77ffc
Author: etobi <git at e-tobi.net>
Date: Sun Feb 15 10:31:57 2015 +0100
Migrating package from yaVDR
- General cleanup
- Fixed debian/watch (Load releaes from git tags)
- Dropped temperatures.frodo
- Standards-Version 3.9.6
- Build-Depend vdr-dev >= 2.1.10
- Set maintainer to Debian VDR Team
---
debian/changelog | 12 +++++
debian/changelog.old | 12 -----
debian/control | 15 +++---
debian/copyright | 1 +
debian/dirs | 4 --
debian/get-new-snapshot.sh | 100 +++++-----------------------------------
debian/install | 1 -
debian/links | 1 -
debian/patches/fix-cairo.diff | 36 ---------------
debian/patches/series | 0
debian/plugin.skindesigner.conf | 1 -
debian/temperatures.frodo | 32 -------------
debian/watch | 3 +-
13 files changed, 34 insertions(+), 184 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a25119b..080136b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vdr-plugin-skindesigner (0.2.2-4) UNRELEASED; urgency=medium
+
+ * Migrating package from yaVDR
+ - General cleanup
+ - Fixed debian/watch (Load releaes from git tags)
+ - Dropped temperatures.frodo
+ - Standards-Version 3.9.6
+ - Build-Depend vdr-dev >= 2.1.10
+ - Set maintainer to Debian VDR Team
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 14 Feb 2015 22:05:25 +0100
+
vdr-plugin-skindesigner (0.2.2-3-gf3ad276-0yavdr0~trusty) trusty; urgency=low
* f3ad276: fixed header icon for plugin menus
diff --git a/debian/changelog.old b/debian/changelog.old
deleted file mode 100644
index 7fe529f..0000000
--- a/debian/changelog.old
+++ /dev/null
@@ -1,12 +0,0 @@
-vdr-plugin-skindesigner (0.2.2-3-gf3ad276-0yavdr0~trusty) trusty; urgency=low
-
- * f3ad276: fixed header icon for plugin menus
-
- -- Frodo <frodo.vdr at gmx.net> Thu, 12 Feb 2015 19:32:18 +0100
-
-vdr-plugin-skindesigner (0.2.2-3-gf3ad276-0yavdr0~precise) precise; urgency=low
-
- * f3ad276: fixed header icon for plugin menus
-
- -- Frodo <frodo.vdr at gmx.net> Thu, 12 Feb 2015 19:31:42 +0100
-
diff --git a/debian/control b/debian/control
index 01a9c41..fcaba82 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,29 @@
Source: vdr-plugin-skindesigner
Section: video
Priority: extra
-Maintainer: Frodo <frodo.vdr at gmx.net>
-Uploaders: Frodo <frodo.vdr at gmx.net>
-Build-Depends: debhelper (>= 9), vdr-dev (>= 2.0.0), pkg-config, gettext, libjpeg-dev, librsvg2-dev, libcairo2-dev, libxml2-dev
-Standards-Version: 3.9.3
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Tobias Grimm <etobi at debian.org>
+Build-Depends: debhelper (>= 9), vdr-dev (>= 2.1.10), pkg-config, gettext, libjpeg-dev, librsvg2-dev, libcairo2-dev, libxml2-dev
+Standards-Version: 3.9.6
Homepage: http://projects.vdr-developer.org/projects/plg-skindesigner
Package: vdr-plugin-skindesigner
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, ttf-ubuntu-font-family
Recommends: fonts-ds-digital, skindesigner-logos, fonts-vdropensans
-Description: skindesigner skin template for VDR
+Description: Customizable skin template engine for VDR
skindesigner is a highly customizable true color skin for the
on-screen-display (OSD) of the Linux Video Disc Recorder VDR.
+ Skins are defined in XML files.
Package: vdr-plugin-skindesigner-dbg
Architecture: any
Section: debug
Priority: extra
Depends: vdr-plugin-skindesigner (= ${binary:Version}), ${misc:Depends}
-Description: skindesigner skin template for VDR - debugging symbols
+Description: Customizable skin template engine for VDR
skindesigner is a highly customizable true color skin for the
on-screen-display (OSD) of the Linux Video Disc Recorder VDR.
+ Skins are defined in XML files.
.
This package contains the debugging symbols.
-
diff --git a/debian/copyright b/debian/copyright
index 21437b2..8e4bdd2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Upstream Author:
Debian Maintainers:
Frodo <frodo.vdr at gmx.net>
+ Tobias Grimm <etobi at debian.org>
Copyright:
(C) 2012 - 2014 Louis Braun
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 9fc4f57..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-var/cache/vdr/plugins
-var/cache/vdr/plugins/skindesigner
-# usr/share/vdr/plugins/skindesigner/skins
-
diff --git a/debian/get-new-snapshot.sh b/debian/get-new-snapshot.sh
old mode 100755
new mode 100644
index b737da7..16d0d86
--- a/debian/get-new-snapshot.sh
+++ b/debian/get-new-snapshot.sh
@@ -1,98 +1,20 @@
echo Downloading latest from git repository...
-# set -x
+set -e
-BUILDDISTRIBUTION=$1
-GITSOURCE='git://projects.vdr-developer.org/vdr-plugin-skindesigner.git'
+DEB_SOURCE_PACKAGE=`egrep '^Source: ' debian/control | cut -f 2 -d ' '`
+VERSION_UPSTREAM=`dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version:\s*//' -e s/-[^-]*$// -e s/\+git.*//`
+VERSION_DATE=`/bin/date --utc +%0Y%0m%0d`
+VERSION_FULL="${VERSION_UPSTREAM}+git${VERSION_DATE}"
-DEB_SOURCE_PACKAGE=$(egrep '^Source: ' debian/control | cut -f 2 -d ' ')
-DISTRIBUTION=$(dpkg-parsechangelog | grep ^Distribution: | sed -e 's/^Distribution:\s*//')
-VERSION_UPSTREAM=$(dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version:\s*//' -e 's/\.git.*//' -e 's/~*//g')
-SUBVERSION=$(dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version:\s*//' -e 's/~.*//g' | awk -F'-' '{ print $4 }' | sed -e 's/yavdr*//g')
-GIT_SHA_OLD=$(git show --pretty=format:"%h" --quiet | head -1 || true)
-
-if [ -d ${DEB_SOURCE_PACKAGE} ] ; then
- rm -rf ${DEB_SOURCE_PACKAGE}
-fi
-
-if [ -d ".git" ] ; then
- git pull
- GITCHANGE=$(git log --pretty=format:"%h: %s" -1)
-fi
-
-VERSION_SOURCE=$(grep 'static const char \*VERSION' skindesigner.c | sed -e 's/^.*=//g' -e 's/[";]//g' -e 's/\s//g')
-VERSION_DATE=$(/bin/date --utc +%0Y%0m%0d)
-GITHEAD=$(git rev-list HEAD | wc -l)
-GITBUILD=$(printf '%04d' "$GITHEAD")
-GITVER=$(git describe | cut -f 1 -d '-')
-GITSUBVER=$(git describe | cut -f 2 -d '-')
-GITDESCBUILD=$(git describe | cut -f 3 -d '-')
-BUILD=$(/bin/date --utc +%H%M)
-
-
-VERSION_FULL="$(git describe)"
-
-git clone --depth 1 ${GITSOURCE} ${DEB_SOURCE_PACKAGE}
+git clone --depth 1 git://projects.vdr-developer.org/skin-nopacity.git ${DEB_SOURCE_PACKAGE}
cd ${DEB_SOURCE_PACKAGE}
-GIT_SHA=$(git show --pretty=format:"%h" --quiet | head -1 || true)
+GIT_SHA=`git show --pretty=format:"%h" --quiet | head -1 || true`
cd ..
-if [ ! $(echo $VERSION_FULL | grep -) ] ; then
- VERSION_FULL="${VERSION_FULL}-0-g${GIT_SHA}"
-fi
-# VERSION_FULL="${VERSION_FULL}.${VERSION_DATE}.${BUILD}"
-
-if [ "x${GIT_SHA_OLD}" == "x${GIT_SHA}" ] ; then
- echo "Keine neue Version von ${DEB_SOURCE_PACKAGE} gefunden: ${GIT_SHA_OLD} = ${GIT_SHA}" | tee ${CHKFILE}
-fi
-
-if [ $DISTRIBUTION != 'trusty' ] ; then
- DISTRIBUTION='trusty'
-else
- DISTRIBUTION='precise'
-fi
-
-if [ ! -z $BUILDDISTRIBUTION ] ; then
- DISTRIBUTION=$BUILDDISTRIBUTION
-fi
-
-test=$(grep ${GIT_SHA} debian/changelog | grep $DISTRIBUTION)
-if [ $? -eq 0 ] ; then
- SUBVERSION=$((SUBVERSION +1))
-else
- SUBVERSION=0
-fi
-
-echo "${VERSION_FULL}-${SUBVERSION}yavdr0~${DISTRIBUTION}"
-
-# exit 0
-
-ARCHTYPEN="xz:J bz2:j gz:z"
-for archtyp in ${ARCHTYPEN}
-do
- arch=`echo $archtyp | cut -d: -f1`
- pack=`echo $archtyp | cut -d: -f2`
- DEBSRCPKGFILE="../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.${arch}"
- DEBSRCPKGFILEBAK="${DEBSRCPKGFILE}.1"
-
- if [ -f ${DEBSRCPKGFILE} ] ; then
- mv ${DEBSRCPKGFILE} ${DEBSRCPKGFILEBAK}
- fi
-
- if [ -f ${DEBSRCPKGFILE} -o -f ${DEBSRCPKGFILEBAK} ] ; then
- echo "$DEBSRCPKGFILE or $DEBSRCPKGFILEBAK exists";
- continue;
- else
- echo $DEBSRCPKGFILE
- tar --exclude=.git --exclude=debian -c${pack}f ${DEBSRCPKGFILE} ${DEB_SOURCE_PACKAGE}
- rm -rf ${DEB_SOURCE_PACKAGE}
-
- dch -b -D ${DISTRIBUTION} -v "${VERSION_FULL}-${SUBVERSION}yavdr0~${DISTRIBUTION}" "${GITCHANGE}"
- mv ./debian/changelog ./debian/changelog.old
- cat ./debian/changelog.old | head -6 > ./debian/changelog
+tar --exclude=.git -czf "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz" ${DEB_SOURCE_PACKAGE}
- break;
- fi
-done
+rm -rf ${DEB_SOURCE_PACKAGE}
-exit 0
+git-import-orig --pristine-tar "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz"
+dch -v "$VERSION_FULL-1" "New Upstream Snapshot (commit $GIT_SHA)"
diff --git a/debian/install b/debian/install
index 60aaaec..5993a0e 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1 @@
debian/plugin.skindesigner.conf etc/vdr/plugins
-debian/temperatures.frodo usr/lib/vdr/plugins/skindesigner/scripts
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 422fe65..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/vdr/plugins/skindesigner/scripts/temperatures.frodo /usr/lib/vdr/plugins/skindesigner/scripts/temperatures
diff --git a/debian/patches/fix-cairo.diff b/debian/patches/fix-cairo.diff
deleted file mode 100644
index bc0039d..0000000
--- a/debian/patches/fix-cairo.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- vdr-plugin-skindesigner (0.0.8-2-g28fd2f5-0frodo0~trusty) trusty; urgency=low
- .
- * New upstream snapshot vdr-plugin-skindesigner 0.0.8-2-g28fd2f5
-Author: Frodo <frodo.vdr at gmx.net>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vdr-plugin-skindesigner-0.0.8-2-g28fd2f5.orig/libcore/imagecreator.c
-+++ vdr-plugin-skindesigner-0.0.8-2-g28fd2f5/libcore/imagecreator.c
-@@ -19,7 +19,7 @@ bool cImageCreator::InitCairoImage(int w
- return false;
- surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
- cr = cairo_create(surface);
-- cairo_set_antialias(cr, CAIRO_ANTIALIAS_BEST);
-+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_SUBPIXEL);
- return true;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/plugin.skindesigner.conf b/debian/plugin.skindesigner.conf
index f37878d..bb8ad7d 100644
--- a/debian/plugin.skindesigner.conf
+++ b/debian/plugin.skindesigner.conf
@@ -8,5 +8,4 @@
# -e <EPGIMAGESPATH>, --epgimages=<IMAGESPATH> Set directory where epgimages are stored,
# default: /var/cache/vdr/plugins/skindesigner/epgimages/
-# --skinpath=/usr/share/vdr/plugins/skindesigner/skins
--epgimages=/var/cache/vdr/epgimages
diff --git a/debian/temperatures.frodo b/debian/temperatures.frodo
deleted file mode 100755
index a7187c8..0000000
--- a/debian/temperatures.frodo
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# please update this script to fit your needs
-# this script is call every time the widget will be drawn, so keep it short and fast ;)
-
-OUTPUTFLDR="/tmp/skindesigner"
-mkdir -p ${OUTPUTFLDR}
-
-# if the script is executed from system_information script set the locale back for "°C"
-LANG=de_DE.UTF-8
-
-# there can be 4 files, cpu, gpu, pccase, motherboard
-
-rm -f ${OUTPUTFLDR}/cpu ${OUTPUTFLDR}/gpu
-
-# intel core-i cpu temp
-#sensors -A coretemp-isa-0000 | grep "Core 0" | awk '{print $3}' | tr -d "+" > ./cpu
-
-# cpu temp
-CPUTEMP=($(sensors -A | grep "Core"))
-CPUTEMP[2]=${CPUTEMP[2]/+} # +36.0°C -> 36.0°C
-echo "${CPUTEMP[2]/./,}" > ${OUTPUTFLDR}/cpu # 36,0°C
-echo "${CPUTEMP[2]%.*}°C" > ${OUTPUTFLDR}/cpu # 36°C
-
-# pc case temp
-#sensors -A acpitz-virtual-0 | grep "temp1" | awk '{print $2}' | tr -d "+" > ${OUTPUTFLDR}/pccase
-
-# nvidia gpu temp
-# nvidia-settings must be run as the user of the x server
-# GPU=$(nvidia-settings -c :0 -t -query GPUCoreTemp | head -n 1)
-GPU=$(nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader)
-echo "${GPU}°C" > ${OUTPUTFLDR}/gpu
diff --git a/debian/watch b/debian/watch
index e7a0637..565e979 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://projects.vdr-developer.org/projects/skin-nopacity/files .*/vdr-skindesigner-(.*)\.tgz
+http://projects.vdr-developer.org/projects/plg-skindesigner/files .*/vdr-skindesigner-(.*)\.tgz
+http://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git/refs .*/vdr-plugin-skindesigner-(.*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-skindesigner.git
More information about the pkg-vdr-dvb-changes
mailing list