[Pkg-cli-apps-commits] r4500 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/98_autoreconf.dpatch rules

Sun Feb 1 20:18:54 UTC 2009

Author: laney-guest
Date: Sun Feb  1 20:18:54 2009
New Revision: 4500

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4500
Log:
* debian/control: Buid-depend on mono-addins >= 0.4 so that edit sidebar
  works properly and we do not have to use embedded copy of m-a.
* debian/control, debian/rules: Regenerate autotools during the build
* Add myself to Uploaders. 

Removed:
    packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/control
    packages/f-spot/trunk/debian/patches/00list
    packages/f-spot/trunk/debian/rules

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4500&op=diff
==============================================================================

--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Feb  1 20:18:54 2009
@@ -22,6 +22,8 @@
   * New upstream version 0.5.0.3, based on Ubuntu package (Closes: #499615)
   * debian/control: Build-depend on libjpeg62-dev, add gvfs-bin dependency
     so that gphoto patch below works.
+  * debian/control: Buid-depend on mono-addins >= 0.4 so that edit sidebar
+    works properly and we do not have to use embedded copy of m-a.
   * debian/watch: Update to correct regex.
   * debian/patches/f-spot-import-gphoto.dpatch: Add. Patch by Martin Pitt to
     allow f-spot to import from gphoto:/// URLs.
@@ -41,7 +43,8 @@
     debian/patches/debian_flickrnet-2.1.5-port.dpatch,
     debian/patches/svn-044-4010_gio-sharp-destdir.dpatch: Removed, now
     upstream.
-  * Add myself to Uploders. 
+  * debian/control, debian/rules: Regenerate autotools during the build
+  * Add myself to Uploaders. 
 
   [ Christopher James Halse Rogers ]
   * debian/patches/debian_link_2.0_profile_cairo.dpatch:
@@ -51,9 +54,8 @@
   * debian/control:
     + gnome-sharp2 transition:
       - lib{gnome,gconf,gnome-vfs}2.0-cil -> lib{gnome,gconf,gnome-vfs}2.24-cil
-  * debian/patches/98_autoreconf.dpatch: Refresh.
-
- -- Christopher James Halse Rogers <chris at CowboyLaputopu>  Sun, 25 Jan 2009 12:05:37 +1100
+
+ -- Iain Lane <laney at ubuntu.com>  Sun, 01 Feb 2009 20:15:17 +0000
 
 f-spot (0.4.4-1) unstable; urgency=medium
 

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4500&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Sun Feb  1 20:18:54 2009
@@ -19,7 +19,7 @@
  libmono-system-runtime2.0-cil,
  libcairo2-dev,
  libmono-cairo2.0-cil,
- libmono-addins0.2-cil,
+ libmono-addins0.2-cil (>= 0.4),
  libmono-addins-gui0.2-cil,
  libndesk-dbus1.0-cil (>= 0.4.2),
  libndesk-dbus-glib1.0-cil (>= 0.3.0),
@@ -44,7 +44,10 @@
  gnome-screensaver,
  gnome-doc-utils (>= 0.3.2),
  docbook-xml,
- intltool
+ intltool,
+ libtool,
+ autoconf,
+ automake1.10
 Standards-Version: 3.8.0
 Homepage: http://www.f-spot.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=4500&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Feb  1 20:18:54 2009
@@ -19,5 +19,4 @@
 ubuntu_fname_quote_percent
 
 # Patches to be applied last.
-98_autoreconf
 99_ltmain_as-needed

Modified: packages/f-spot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/rules?rev=4500&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Sun Feb  1 20:18:54 2009
@@ -9,6 +9,9 @@
 # needed to use the dpatch tools (like dpatch-edit-patch)
 include /usr/share/dpatch/dpatch.make
 
+VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
+UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
+
 export DEB_DH_MAKESHLIBS_ARGS="-n"
 
 CFLAGS := -Wall -g
@@ -16,6 +19,11 @@
 DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
+
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_AUTOCONF = true
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
 
 common-configure-indep::
 	mkdir -p $(MONO_SHARED_DIR)/.wapi
@@ -32,3 +40,11 @@
 
 clean::
 	rm -rf $(MONO_SHARED_DIR)/.wapi
+
+get-orig-source:
+	[ -d ../tarballs ] || mkdir ../tarballs
+	uscan \
+		--force-download \
+		--download-version $(UPVERSION) \
+		--rename \
+		--destdir ../tarballs


