[Pkg-cli-apps-commits] r4262 - in /packages/gfax/trunk/debian: ./ patches/

hanska-guest at users.alioth.debian.org hanska-guest at users.alioth.debian.org
Wed Dec 3 20:13:57 UTC 2008 

Author: hanska-guest
Date: Wed Dec  3 20:13:57 2008
New Revision: 4262

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4262
Log:
* debian/control updated
* debian/patches/* updated
* debian/patches/:
  + 99_autoreconf+intltoolize.dpatch removed
* debian/rules:
  + correctly re-generate autotools files

Removed:
    packages/gfax/trunk/debian/patches/99_autoreconf+intltoolize.dpatch
Modified:
    packages/gfax/trunk/debian/changelog
    packages/gfax/trunk/debian/control
    packages/gfax/trunk/debian/patches/00list
    packages/gfax/trunk/debian/patches/01_fix_makefile.dpatch
    packages/gfax/trunk/debian/patches/02_libgnomeprint_path.dpatch
    packages/gfax/trunk/debian/patches/04_use_gconfsharp-schemagen_wrapper.dpatch
    packages/gfax/trunk/debian/patches/fr.po.dpatch
    packages/gfax/trunk/debian/rules

Modified: packages/gfax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/changelog?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/changelog (original)
+++ packages/gfax/trunk/debian/changelog Wed Dec  3 20:13:57 2008
@@ -3,8 +3,14 @@
   * debian/compat bumped to 7
   * Group Policy:
     + get-orig-source implemented in debian/rules
+  * debian/control updated
+  * debian/patches/* updated
+  * debian/patches/:
+    + 99_autoreconf+intltoolize.dpatch removed
+  * debian/rules:
+    + correctly re-generate autotools files
 
- -- David Paleino <d.paleino at gmail.com>  Wed, 03 Dec 2008 19:19:37 +0100
+ -- David Paleino <d.paleino at gmail.com>  Wed, 03 Dec 2008 21:12:56 +0100
 
 gfax (0.7.6-9) unstable; urgency=low
 

Modified: packages/gfax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/control?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/control (original)
+++ packages/gfax/trunk/debian/control Wed Dec  3 20:13:57 2008
@@ -1,9 +1,26 @@
 Source: gfax
 Section: gnome
 Priority: optional
-Maintainer: Mirco Bauer <meebey at debian.org>
+Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Uploaders: Mirco Bauer <meebey at debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.5.4), mono-mcs (>= 1.0) | c-sharp-compiler, libgtk2.0-cil, libgnome2.0-cil (>= 2.20), libgconf2.0-cil, libglade2.0-cil, libglib2.0-cil, libevolution3.0-cil, libgnomeprint2.2-dev, gettext, intltool, gnome-doc-utils
+Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+ mono-devel,
+ libgtk2.0-cil,
+ libgnome2.0-cil (>= 2.20),
+ libgconf2.0-cil,
+ libgconf2-dev,
+ libglade2.0-cil,
+ libglib2.0-cil,
+ libevolution3.0-cil,
+ libgnomeprint2.2-dev,
+ gettext,
+ intltool,
+ gnome-doc-utils,
+ libtool,
+ autoconf,
+ automake,
+ autotools-dev
 Standards-Version: 3.7.3
 Homepage: http://www.cowlug.org/gfax/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gfax/trunk/

Modified: packages/gfax/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/00list?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/00list (original)
+++ packages/gfax/trunk/debian/patches/00list Wed Dec  3 20:13:57 2008
@@ -4,4 +4,3 @@
 pretty_date_format
 fix_mkdir_p_var
 fr.po
-99_autoreconf+intltoolize

Modified: packages/gfax/trunk/debian/patches/01_fix_makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/01_fix_makefile.dpatch?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/01_fix_makefile.dpatch (original)
+++ packages/gfax/trunk/debian/patches/01_fix_makefile.dpatch Wed Dec  3 20:13:57 2008
@@ -5,29 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gfax-0.7.4~/src/Makefile.in gfax-0.7.4/src/Makefile.in
---- gfax-0.7.4~/src/Makefile.in	2006-02-03 22:00:59.000000000 +0100
-+++ gfax-0.7.4/src/Makefile.in	2006-02-03 22:04:47.270334016 +0100
-@@ -290,14 +290,14 @@
- 
- install-data-local: $(TARGET)
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
--	$(mkinstalldirs) -m 777 $(DESTDIR)/../var/spool/gfax
--	$(mkinstalldirs) -m 777 $(DESTDIR)/../var/spool/gfax/doneq
--	$(mkinstalldirs) -m 777 $(DESTDIR)/../var/spool/gfax/recq
-+	$(mkinstalldirs) -m 1777 $(DESTDIR)/var/spool/gfax
-+	$(mkinstalldirs) -m 1777 $(DESTDIR)/var/spool/gfax/doneq
-+	$(mkinstalldirs) -m 1777 $(DESTDIR)/var/spool/gfax/recq
- 	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(pkglibdir)/$(TARGET)
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(pkglibdir)/$(TARGET)
--	rm -rf $(DESTDIR)/../var/spool/gfax
-+	rm -rf $(DESTDIR)/var/spool/gfax
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-
 diff -urNad gfax-0.7.4~/src/Makefile.am gfax-0.7.4/src/Makefile.am
 --- gfax-0.7.4~/src/Makefile.am	2005-12-19 20:33:53.000000000 +0100
 +++ gfax-0.7.4/src/Makefile.am	2006-02-03 22:05:24.151727192 +0100
@@ -46,3 +23,14 @@
  
  EXTRA_DIST =            		\
  	$(srcdir)/Defines.cs.in		\
+diff -urNad gfax-0.7.6~/Makefile.am gfax-0.7.6/Makefile.am
+--- gfax-0.7.6~/Makefile.am	2006-11-30 02:30:04.000000000 +0100
++++ gfax-0.7.6/Makefile.am	2008-12-03 20:44:21.000000000 +0100
+@@ -21,7 +21,6 @@
+ 	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+ 	  done \
+ 	fi
+-	killall -HUP gconfd-2
+ else
+ install-data-local:
+ endif

Modified: packages/gfax/trunk/debian/patches/02_libgnomeprint_path.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/02_libgnomeprint_path.dpatch?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/02_libgnomeprint_path.dpatch (original)
+++ packages/gfax/trunk/debian/patches/02_libgnomeprint_path.dpatch Wed Dec  3 20:13:57 2008
@@ -5,18 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gfax-0.7.4~/configure gfax-0.7.4/configure
---- gfax-0.7.4~/configure	2006-02-03 21:58:55.000000000 +0100
-+++ gfax-0.7.4/configure	2006-02-03 21:59:44.901301096 +0100
-@@ -21024,7 +21024,7 @@
- 
- # SET THE DIRECTORY PATH FOR GNOME_PRINT_DATA_DIR
- if test "x$GNOME_PRINT_DATA_DIR" = "x" ; then
--	gpver=`ls ${prefix}/lib/pkgconfig/ | grep libgnomeprint`
-+	gpver=libgnomeprint-2.2.pc
- 	GNOME_PRINT_VERSION=`grep Version: ${prefix}/lib/pkgconfig/${gpver} | cut -f2 -d' '`
- 	GNOME_PRINT_DATA_DIR="${datadir}/libgnomeprint/${GNOME_PRINT_VERSION}"
- 	echo $GNOME_PRINT_DATA_DIR
 diff -urNad gfax-0.7.4~/configure.in gfax-0.7.4/configure.in
 --- gfax-0.7.4~/configure.in	2005-12-19 18:54:06.000000000 +0100
 +++ gfax-0.7.4/configure.in	2006-02-03 22:00:20.639868008 +0100

Modified: packages/gfax/trunk/debian/patches/04_use_gconfsharp-schemagen_wrapper.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/04_use_gconfsharp-schemagen_wrapper.dpatch?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/04_use_gconfsharp-schemagen_wrapper.dpatch (original)
+++ packages/gfax/trunk/debian/patches/04_use_gconfsharp-schemagen_wrapper.dpatch Wed Dec  3 20:13:57 2008
@@ -5,18 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gfax-0.7.4~/src/Makefile.in gfax-0.7.4/src/Makefile.in
---- gfax-0.7.4~/src/Makefile.in	2006-02-05 23:47:25.698322600 +0100
-+++ gfax-0.7.4/src/Makefile.in	2006-02-05 23:48:51.210322800 +0100
-@@ -281,7 +281,7 @@
- 
- Settings.cs: Settings.cs
- 	env GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(SCHEMA); \
--	gconfsharp-schemagen.exe gfax $(SCHEMA) > $(srcdir)/Settings.cs
-+	gconfsharp2-schemagen gfax $(SCHEMA) > $(srcdir)/Settings.cs
- 
- gfax.exe: $(CSFILES) $(GENERATED_CSFILES)
- 	$(CSC) $(CSFLAGS) $(GFAX_LIBS) $(ASSEMBLIES) $(RESOURCES) $(CSFILES) $(GENERATED_CSFILES) -o $@ 
 diff -urNad gfax-0.7.4~/src/Makefile.am gfax-0.7.4/src/Makefile.am
 --- gfax-0.7.4~/src/Makefile.am	2006-02-05 23:47:25.698322600 +0100
 +++ gfax-0.7.4/src/Makefile.am	2006-02-05 23:48:38.911192552 +0100

Modified: packages/gfax/trunk/debian/patches/fr.po.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/fr.po.dpatch?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/fr.po.dpatch (original)
+++ packages/gfax/trunk/debian/patches/fr.po.dpatch Wed Dec  3 20:13:57 2008
@@ -5,18 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gfax-0.7.6~/configure gfax-0.7.6/configure
---- gfax-0.7.6~/configure	2007-04-20 17:46:57.000000000 +0200
-+++ gfax-0.7.6/configure	2007-04-20 17:46:57.000000000 +0200
-@@ -19050,7 +19050,7 @@
- #
- # Setup GETTEXT
- #
--ALL_LINGUAS="en_CA de nl"
-+ALL_LINGUAS="en_CA de nl fr"
- GETTEXT_PACKAGE=gfax
- 
- 
 diff -urNad gfax-0.7.6~/configure.in gfax-0.7.6/configure.in
 --- gfax-0.7.6~/configure.in	2007-04-20 17:46:57.000000000 +0200
 +++ gfax-0.7.6/configure.in	2007-04-20 17:46:57.000000000 +0200

Modified: packages/gfax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/rules?rev=4262&op=diff
==============================================================================
--- packages/gfax/trunk/debian/rules (original)
+++ packages/gfax/trunk/debian/rules Wed Dec  3 20:13:57 2008
@@ -21,19 +21,30 @@
 
 include /usr/share/dpatch/dpatch.make
 
-config.status: configure
+configure: configure-stamp
+configure-stamp: patch
 	dh_testdir
+	
+	libtoolize
+	intltoolize
+	aclocal
+	autoconf
+	automake --add-missing --copy
+	
+	CSC="/usr/bin/csc -debug" \
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 	  --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc \
 	  --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	  --disable-schemas-install
 	# --enable-dbus=yes
+	
+	touch $@
 
-build: patch build-stamp
-build-stamp: config.status
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE)
-	touch build-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -43,10 +54,9 @@
 	# upstream's make clean is unclean
 	rm -f src/gfax.exe.mdb
 	rm -rf $(MONO_SHARED_DIR)/.wapi
-	rm -f config.status
 	rm -f debian/gfax.1 debian/postinst
-	rm -f build-stamp 
-	dh_clean 
+	find . -name "Makefile.in" -delete
+	dh_clean config.status config.sub config.guess configure ltmain.sh
 
 install: build
 	dh_testdir

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