[Pkg-cli-apps-commits] r4770 - in /packages/gnome-do/trunk/debian: changelog control patches/00_remove_bundledlibs.dpatch patches/00list rules watch

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Sun Mar 22 23:24:54 UTC 2009 

Author: laney-guest
Date: Sun Mar 22 23:24:54 2009
New Revision: 4770

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4770
Log:
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

Added:
    packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch   (with props)
Modified:
    packages/gnome-do/trunk/debian/changelog
    packages/gnome-do/trunk/debian/control
    packages/gnome-do/trunk/debian/patches/00list
    packages/gnome-do/trunk/debian/rules
    packages/gnome-do/trunk/debian/watch

Modified: packages/gnome-do/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/changelog?rev=4770&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Sun Mar 22 23:24:54 2009
@@ -1,4 +1,4 @@
-gnome-do (0.8.1.3-1) UNRELEASED; urgency=low
+gnome-do (0.8.1.3+dfsg-1) UNRELEASED; urgency=low
 
   [ Daniel T Chen ]
   * New upstream release (LP: #344578).
@@ -73,8 +73,11 @@
     that applications are properly indexed. Patch backported from upstream.
   * debian/control: Add myself to Uploaders. 
   * Really bump versioned dep on libgtk2.0-cil
+  * 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
 
- -- Iain Lane <laney at ubuntu.com>  Sun, 22 Mar 2009 11:20:40 +0000
+ -- Iain Lane <laney at ubuntu.com>  Sun, 22 Mar 2009 22:44:39 +0000
 
 gnome-do (0.8.0-1) unstable; urgency=low
 

Modified: packages/gnome-do/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/control?rev=4770&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/control (original)
+++ packages/gnome-do/trunk/debian/control Sun Mar 22 23:24:54 2009
@@ -6,7 +6,10 @@
 Build-Depends: debhelper (>= 7), 
                dpatch,
                mono-devel (>= 2.0.1),
+               intltool,
+               autoconf,
                autotools-dev,
+               automake,
                libndesk-dbus1.0-cil,
                libndesk-dbus-glib1.0-cil,
                libmono-cairo2.0-cil,
@@ -19,6 +22,7 @@
                libgnome2.24-cil,
                libgnome-vfs2.0-cil,
                libgconf2.0-cil,
+               libgconf2-dev,
                libgnomedesktop2.20-cil,
                libgnome-keyring1.0-cil,
                libmono-addins0.2-cil,

Added: packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch?rev=4770&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch (added)
+++ packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch Sun Mar 22 23:24:54 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_remove_bundledlibs.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-do-0.8.1.3+dfsg~/Makefile.am gnome-do-0.8.1.3+dfsg/Makefile.am
+--- gnome-do-0.8.1.3+dfsg~/Makefile.am	2009-03-17 17:57:09.000000000 +0000
++++ gnome-do-0.8.1.3+dfsg/Makefile.am	2009-03-22 22:35:31.000000000 +0000
+@@ -4,7 +4,6 @@
+ 
+ SUBDIRS = \
+ 	. \
+-	BundledLibraries \
+ 	data \
+ 	Do.Universe \
+ 	Do.Platform \
+ 

Propchange: packages/gnome-do/trunk/debian/patches/00_remove_bundledlibs.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-do/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/00list?rev=4770&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/patches/00list (original)
+++ packages/gnome-do/trunk/debian/patches/00list Sun Mar 22 23:24:54 2009
@@ -1,3 +1,4 @@
+00_remove_bundledlibs
 01_fix_libX11_linkage
 02_use_cli_for_wrapper
 10_application_search_path

Modified: packages/gnome-do/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/rules?rev=4770&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/rules (original)
+++ packages/gnome-do/trunk/debian/rules Sun Mar 22 23:24:54 2009
@@ -9,8 +9,11 @@
 
 CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
 
-build: build-stamp
-build-stamp: patch-stamp
+configure: patch-stamp
+	autoreconf -I m4/shamrock
+	touch $@
+
+build: configure
 	MCS=/usr/bin/csc dh build
 	touch $@
 
@@ -31,13 +34,30 @@
 # how portable/version independent it is.
 # This magic care of Emmet Hickory:
 # (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html)
-get-orig-source:
+TEMP_DIR := $(shell mktemp -d)
+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)
+UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,') 
+TARBALL = $(shell echo "gnome-do_$(UPVERSION).orig.tar.gz" | tr -d " ")
+
+download-tarball:
+	uscan --download --destdir $(TEMP_DIR) \
+	      --no-symlink --force-download --download-version $(CURVER) \
+	      --watchfile=$(dir $(_))/watch
+	cd $(TEMP_DIR) && tar xzvf *.tar.gz
+
+strip-shipped-binaries: download-tarball
+	rm $(SOURCE_DIR)/BundledLibraries/*.exe
+
+repack-source: strip-shipped-binaries
+	cd $(TEMP_DIR) && \
+		tar czvf $(TARBALL) \
+			$(notdir $(SOURCE_DIR))
+
+get-orig-source: repack-source
 	[ -d ../tarballs ] || mkdir ../tarballs
-	uscan \
-		--destdir=../tarballs \
-		--rename \
-		--download-version $(CURVER) \
-		--force-download \
-		--watchfile=$(dir $(_))/watch
+	mv $(TEMP_DIR)/*.orig.tar.gz ../tarballs
+	rm -r $(TEMP_DIR)
 
-.PHONY: build clean install binary binary-arch get-orig-source
+.PHONY: configure build clean install binary binary-arch download-tarball strip-shipped-binaries repack-source get-orig-source

Modified: packages/gnome-do/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/watch?rev=4770&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/watch (original)
+++ packages/gnome-do/trunk/debian/watch Sun Mar 22 23:24:54 2009
@@ -1,3 +1,4 @@
 version=3
 
+opts=dversionmangle=s/\+dfsg(\d)*$// \
 https://launchpad.net/do/+download http://launchpad.net/do/.*/.*/\+download/gnome-do-(.*).tar.gz

More information about the Pkg-cli-apps-commits mailing list