[Pkg-cli-apps-commits] r4772 - in /packages/gnome-do/trunk/debian: changelog control rules

Sun Mar 22 23:52:04 UTC 2009

Author: meebey
Date: Sun Mar 22 23:52:04 2009
New Revision: 4772

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4772
Log:
  * debian/rules:
    + Made get-orig-source target policy conform.
    + Use dh override targets instead of sequence injection.
  * debian/control:
    + Bumped debhelper build-dep to >= 7.0.50
    + Bumped Standards-Version to 3.8.1 (no changes needed)


Modified:
    packages/gnome-do/trunk/debian/changelog
    packages/gnome-do/trunk/debian/control
    packages/gnome-do/trunk/debian/rules

Modified: packages/gnome-do/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/changelog?rev=4772&op=diff
==============================================================================

--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Sun Mar 22 23:52:04 2009
@@ -1,4 +1,4 @@
-gnome-do (0.8.1.3+dfsg-1) UNRELEASED; urgency=low
+gnome-do (0.8.1.3+dfsg-1) unstable; urgency=low
 
   [ Daniel T Chen ]
   * New upstream release (LP: #344578).
@@ -76,6 +76,14 @@
   * debian/control, debian/rules, debian/watch,
     debian/patches/00_remove_bundledlibs.dpatch, debian/README.source:
     Upstream source needs repackaging due to shipped copy of gmcs.exe
+
+  [ Mirco Bauer ]
+  * debian/rules:
+    + Made get-orig-source target policy conform.
+    + Use dh override targets instead of sequence injection.
+  * debian/control:
+    + Bumped debhelper build-dep to >= 7.0.50
+    + Bumped Standards-Version to 3.8.1 (no changes needed)
 
  -- Iain Lane <laney at ubuntu.com>  Sun, 22 Mar 2009 22:44:39 +0000
 

Modified: packages/gnome-do/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/control?rev=4772&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/control (original)
+++ packages/gnome-do/trunk/debian/control Sun Mar 22 23:52:04 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Iain Lane <laney at ubuntu.com>
-Build-Depends: debhelper (>= 7), 
+Build-Depends: debhelper (>= 7.0.50), 
                dpatch,
                mono-devel (>= 2.0.1),
                intltool,
@@ -32,7 +32,7 @@
                libgtk2.0-dev,
                librsvg2-2.18-cil,
                libwnck2.20-cil
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://do.davebsd.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gnome-do/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/

Modified: packages/gnome-do/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/rules?rev=4772&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/rules (original)
+++ packages/gnome-do/trunk/debian/rules Sun Mar 22 23:52:04 2009
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
@@ -7,34 +6,21 @@
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
-
 configure: patch-stamp
 	autoreconf -I m4/shamrock
-	touch $@
 
-build: configure
-	MCS=/usr/bin/csc dh build
-	touch $@
+override_dh_auto_configure: configure
+	dh_auto_configure -- MCS=/usr/bin/csc
 
-clean: unpatch
+override_dh_clean: unpatch
+	dh_clean
+
+%:
 	dh $@
 
-install: build
-	dh $@
-
-binary: binary-arch
-binary-arch: install
-	dh $@
-
-
-# Makefile arcanery warning:
-# $(dir $(_)) gives us the path containing this rules file.  
-# I haven't found this documented in any make documentation, so I am unsure 
-# how portable/version independent it is.
-# This magic care of Emmet Hickory:
-# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html)
 TEMP_DIR := $(shell mktemp -d)
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
 SOURCE_DIR = $(word 1, $(shell ls -d --group-directories-first $(TEMP_DIR)/*))
 CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 | cut -d"+" -f1 )
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d" " -f2)
@@ -44,7 +30,7 @@
 download-tarball:
 	uscan --download --destdir $(TEMP_DIR) \
 	      --no-symlink --force-download --download-version $(CURVER) \
-	      --watchfile=$(dir $(_))/watch
+	      --watchfile=$(DEBIAN_DIR)/watch
 	cd $(TEMP_DIR) && tar xzvf *.tar.gz
 
 strip-shipped-binaries: download-tarball
@@ -56,8 +42,7 @@
 			$(notdir $(SOURCE_DIR))
 
 get-orig-source: repack-source
-	[ -d ../tarballs ] || mkdir ../tarballs
-	mv $(TEMP_DIR)/*.orig.tar.gz ../tarballs
+	mv $(TEMP_DIR)/*.orig.tar.gz .
 	rm -r $(TEMP_DIR)
 
-.PHONY: configure build clean install binary binary-arch download-tarball strip-shipped-binaries repack-source get-orig-source
+.PHONY: configure patch unpatch download-tarball strip-shipped-binaries repack-source get-orig-source


