[SCM] vdr-plugin-graphtft packaging repository branch, master, updated. debian/0.3.2_rc2+svn20090728.2153-5-9-g15cfd37

etobi git at e-tobi.net
Sat Jun 2 19:25:50 UTC 2012


The following commit has been merged in the master branch:
commit 2da66fa81b8fec376bc52c8e77cad72737db1715
Author: etobi <git at e-tobi.net>
Date:   Sat Jun 2 20:55:21 2012 +0200

    New upstream snapshot

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 54d6fec..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
-   /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index d8f9288..0c896a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-graphtft (0.3.2~rc2+svn20120602.1849-1) experimental; urgency=low
+
+  * New upstream snapshot
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 02 Jun 2012 20:52:10 +0200
+
 vdr-plugin-graphtft (0.3.2~rc2+svn20090728.2153-5) experimental; urgency=low
 
   * Adapted 02_ffmpeg.dpatch to newer ffmpeg versions
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1ded424..ebc56fd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>
 Origin: ctvdr
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), pkg-config,
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.6.0-5), pkg-config,
  libtool, gettext,
  libimlib2-dev, libavcodec-dev (>= 0.cvs20060329-4), libgtop2-dev,
  libmagick++9-dev | libmagick++-dev, libswscale-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Homepage: http://www.jwendel.de/vdr/
 
 Package: vdr-plugin-graphtft
diff --git a/debian/install b/debian/install
index 936c8e3..c61fafd 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
 libvdr-graphtft.so.*            usr/lib/vdr/plugins/
 debian/plugin.graphtft.conf     etc/vdr/plugins/
-debian/tmp/usr/share/locale
+locale                          usr/share/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cae9ae3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_Makefile-fPIC-fix
-02_ffmpeg
-03_gcc44
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.patch
similarity index 100%
rename from debian/patches/01_Makefile-fPIC-fix.dpatch
rename to debian/patches/01_Makefile-fPIC-fix.patch
diff --git a/debian/patches/02_ffmpeg.dpatch b/debian/patches/02_ffmpeg.patch
similarity index 100%
rename from debian/patches/02_ffmpeg.dpatch
rename to debian/patches/02_ffmpeg.patch
diff --git a/debian/patches/03_gcc44.dpatch b/debian/patches/03_gcc44.patch
similarity index 100%
rename from debian/patches/03_gcc44.dpatch
rename to debian/patches/03_gcc44.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f58a26c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_Makefile-fPIC-fix.patch
+02_ffmpeg.patch
+03_gcc44.patch
diff --git a/debian/rules b/debian/rules
index 8387e0c..26b4bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = documents/HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
+%:
+	dh $@
 
-build/vdr-plugin-graphtft::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-build/vdr-graphtft-fe::
-	$(MAKE) -C graphtft-fe
-
-cleanbuilddir::
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf locale libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
 
 VERSION_ID = $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+svn.*//')+svn$(shell date --utc +%0Y%0m%0d.%0k%0M)
 get-orig-source::
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
vdr-plugin-graphtft packaging repository



More information about the pkg-vdr-dvb-changes mailing list