r11825 - in /tools/gnome-pkg-tools: 1/rules/gnome-get-source.mk debian/changelog debian/gnome-pkg-tools.install desktop-check-mime-types
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Thu Jul 5 18:24:09 UTC 2007
Author: lool
Date: Thu Jul 5 18:24:09 2007
New Revision: 11825
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11825
Log:
* New script, desktop-check-mime-types, will fail if a MIME type found in a
publicly installed .desktop file isn't listed in a debian/*.mime file.
Added:
tools/gnome-pkg-tools/desktop-check-mime-types (contents, props changed)
- copied, changed from r11814, desktop/unstable/evince/debian/check-mime-types.pl
Modified:
tools/gnome-pkg-tools/1/rules/gnome-get-source.mk
tools/gnome-pkg-tools/debian/changelog
tools/gnome-pkg-tools/debian/gnome-pkg-tools.install
Modified: tools/gnome-pkg-tools/1/rules/gnome-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/gnome-get-source.mk?rev=11825&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/gnome-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/gnome-get-source.mk Thu Jul 5 18:24:09 2007
@@ -6,6 +6,11 @@
# compute the major.minor part of the upstream version
DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+
+# search for a SVN revision in the version of the changelog
+# accepted formats: foo.svn.r42, foo.svn.42, foo.svn.r42.20070512,
+# foo.svn.42.20070512
+DEB_UPSTREAM_SVN_REV ?= $(shell echo $(DEB_UPSTREAM_VERSION) | sed -rn 's/^.*\.svn\.r?([0-9]+)(\.[0-9]+)?$$/\1/p')
# where to store the resulting .orig tarball
DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
@@ -19,17 +24,26 @@
GNOME_DOWNLOAD_URL ?= http://ftp.gnome.org/pub/GNOME/sources/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
GNOME_DOWNLOAD_COMMAND ?= wget -nv -T10 -t3 -O $(if $(DEB_USE_DBS_TARBALL_LAYOUT),$(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL),$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz) $(GNOME_DOWNLOAD_URL)
+GNOME_SVN_BRANCH ?= trunk
+GNOME_SVN_URL ?= http://svn.gnome.org/svn/$(GNOME_MODULE)/$(GNOME_SVN_BRANCH)
+
get-orig-source:
dh_testdir
@@echo 'Source package: $(DEB_SOURCE_PACKAGE)'
- @@echo 'Source package: $(DEB_VERSION)'
+ @@echo 'Source version: $(DEB_VERSION)'
@@echo 'Source version without epoch: $(DEB_NOEPOCH_VERSION)'
@@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)'
+ # create tarball dir
mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
+ifeq ($(DEB_UPSTREAM_SVN_REV),)
$(GNOME_DOWNLOAD_COMMAND)
@# create a dbs tarball if necessary
$(if $(DEB_USE_DBS_TARBALL_LAYOUT),gnome-make-tartar $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL) $(DEB_SOURCE_PACKAGE) $(DEB_UPSTREAM_VERSION))
@# remove the original tarball if necessary
$(if $(DEB_USE_DBS_TARBALL_LAYOUT),rm -f $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL))
+else
+ @@echo 'Upstream SVN rev: $(DEB_UPSTREAM_SVN_REV)'
+ svn co
+endif
.PHONY: get-orig-source print-version
Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=11825&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Thu Jul 5 18:24:09 2007
@@ -1,3 +1,10 @@
+gnome-pkg-tools (0.12) UNRELEASED; urgency=low
+
+ * New script, desktop-check-mime-types, will fail if a MIME type found in a
+ publicly installed .desktop file isn't listed in a debian/*.mime file.
+
+ -- Loic Minier <lool at dooz.org> Thu, 05 Jul 2007 20:21:13 +0200
+
gnome-pkg-tools (0.11.9) unstable; urgency=low
* Add myself.
Modified: tools/gnome-pkg-tools/debian/gnome-pkg-tools.install
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/gnome-pkg-tools.install?rev=11825&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/gnome-pkg-tools.install (original)
+++ tools/gnome-pkg-tools/debian/gnome-pkg-tools.install Thu Jul 5 18:24:09 2007
@@ -1,4 +1,5 @@
-pkg-gnome.team usr/share/gnome-pkg-tools/
-1 usr/share/gnome-pkg-tools/
-gnome-dupload usr/bin/
-gnome-make-tartar usr/bin/
+pkg-gnome.team usr/share/gnome-pkg-tools/
+1 usr/share/gnome-pkg-tools/
+gnome-dupload usr/bin/
+gnome-make-tartar usr/bin/
+desktop-check-mime-types usr/bin/
Copied: tools/gnome-pkg-tools/desktop-check-mime-types (from r11814, desktop/unstable/evince/debian/check-mime-types.pl)
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/desktop-check-mime-types?rev=11825&op=diff
==============================================================================
--- desktop/unstable/evince/debian/check-mime-types.pl (original)
+++ tools/gnome-pkg-tools/desktop-check-mime-types Thu Jul 5 18:24:09 2007
@@ -1,5 +1,4 @@
-# shebang disabled as this is shipped in the .diff.gz
-#/usr/bin/perl -T
+#!/usr/bin/perl -T
# compares MIME types in installed .desktop files with the ones installed in
# debian/*.mime files
Propchange: tools/gnome-pkg-tools/desktop-check-mime-types
------------------------------------------------------------------------------
svn:executable = *
More information about the pkg-gnome-commits
mailing list