[DebianBRTeam-commits] r565 - in /packages/gconjugue/trunk/debian: changelog control patches/ rules

[eriberto-guest at users.alioth.debian.org]

Author: eriberto-guest
Date: Tue Aug 11 19:05:35 2009
New Revision: 565

URL: http://svn.debian.org/wsvn/?sc=1&rev=565
Log:
debian:
  * Removed patch directory and his content. The menu location was fixed by upstream.

debian/control:
  * Removed dpatch as dependency.

debian/rules:
  * Removed unnecessary support to patches with dpatch.
  * Fixed possible cross-compilation mode in Autoconf.


Removed:
    packages/gconjugue/trunk/debian/patches/
Modified:
    packages/gconjugue/trunk/debian/changelog
    packages/gconjugue/trunk/debian/control
    packages/gconjugue/trunk/debian/rules

Modified: packages/gconjugue/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/changelog?rev=565&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/changelog (original)
+++ packages/gconjugue/trunk/debian/changelog Tue Aug 11 19:05:35 2009
@@ -1,3 +1,22 @@
+gconjugue (0.7.1-3) unstable; urgency=low
+
+  * Fixed possible cross-compilation mode in Autoconf (thanks to Rafael
+    Laboissiere).
+  * Removed unnecessary patch (file debian/patches/01_change_menu.dpatch). The
+    menu location was fixed by upstream in the last version.
+  * Removed dpatch from Build-depends in debian/control.
+  * Removed dpatch arguments from debian/rules.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Mon, 15 Sep 2008 09:38:52 -0300
+
+gconjugue (0.7.1-2.1) UNRELEASED; urgency=low
+
+  * debian/rules: Do not pass the --host option to configure when BUILD
+    and HOST types are the same, preventing Autoconf to enter
+    cross-compilation mode.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 30 Jul 2008 01:11:58 +0200
+
 gconjugue (0.7.1-2) unstable; urgency=low
 
   * Fixed a typo in debian/control.
@@ -21,7 +40,7 @@
   * Updated Vcs-Svn and Vcs-Browser fields in debian/control.
   * Changed short and long descriptions in debian/control.
   * Changed Section from gnome to misc in debian/control.
-  * Updated dates (years) in debian/copyright.    
+  * Updated dates (years) in debian/copyright.
 
  -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Tue, 24 Jun 2008 09:23:01 -0300
 

Modified: packages/gconjugue/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/control?rev=565&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/control (original)
+++ packages/gconjugue/trunk/debian/control Tue Aug 11 19:05:35 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
 Uploaders: Jakson Alves de Aquino <jalvesaq at gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, libgtk2.0-dev, dpatch
+Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, libgtk2.0-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/gconjugue
 Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/gconjugue

Modified: packages/gconjugue/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/rules?rev=565&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/rules (original)
+++ packages/gconjugue/trunk/debian/rules Tue Aug 11 19:05:35 2009
@@ -3,15 +3,14 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
-# Define variables
-#DESTDIR = $(CURDIR)/debian/gconjugue
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+confflags = --build=$(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --host=$(DEB_HOST_GNU_TYPE)
+endif
 
 config.status: configure
 	dh_testdir
@@ -21,22 +20,22 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=$(DESTDIR)/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure $(confflags) --prefix=$(DESTDIR)/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
 
-build-stamp:  config.status patch-stamp
+build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
 	rm -f config.sub config.guess
-	dh_clean 
+	dh_clean
 
 install: build 
 	dh_testdir
@@ -61,4 +60,4 @@
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install