[pkg-xmule-commits] CVS xmule/debian

[CVS User dleidert-guest]

Update of /cvsroot/pkg-xmule/xmule/debian
In directory haydn:/tmp/cvs-serv17317/debian

Modified Files:
	changelog control rules 
Log Message:
xmule (1.10.0b-2) unstable; urgency=low

  * added: 06_update_German_translation.dpatch - German translation fixes
    contributed by Jens Seidel (Closes: #313864)
  * fixed: 99_fix_general_build_issues - minor additions to fix a compilation
    problem and really use CFLAGS as determined in debian/rules to compile the
    xMule binary
  * minor fixes in debian/control and debian/rules
  
 -- xMule Package Maintainers <pkg-xmule-maintainers@lists.alioth.debian.org>  Wed, 15 Jun 2005 15:09:39 +0200


--- /cvsroot/pkg-xmule/xmule/debian/changelog	2005/05/14 19:32:00	1.12
+++ /cvsroot/pkg-xmule/xmule/debian/changelog	2005/06/15 13:16:25	1.13
@@ -1,3 +1,14 @@
+xmule (1.10.0b-2) unstable; urgency=low
+
+  * added: 06_update_German_translation.dpatch - German translation fixes
+    contributed by Jens Seidel (Closes: #313864)
+  * fixed: 99_fix_general_build_issues - minor additions to fix a compilation
+    problem and really use CFLAGS as determined in debian/rules to compile the
+    xMule binary
+  * minor fixes in debian/control and debian/rules
+
+ -- xMule Package Maintainers <pkg-xmule-maintainers@lists.alioth.debian.org>  Wed, 15 Jun 2005 15:09:39 +0200
+
 xmule (1.10.0b-1) unstable; urgency=low
 
   * new upstream release (Closes: #301835)
--- /cvsroot/pkg-xmule/xmule/debian/control	2005/05/22 17:58:19	1.7
+++ /cvsroot/pkg-xmule/xmule/debian/control	2005/06/15 13:16:25	1.8
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: xMule Package Maintainers <pkg-xmule-maintainers@lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel@debian.org>
-Build-Depends: debhelper (>> 4.0.0), autoconf, automake1.7, autotools-dev, cvs, dpatch, bison, docbook-to-man, gawk, gettext, libcrypto++-dev, libgtk1.2-dev, libexpat1-dev, libwxgtk2.4-dev, libwxgtk2.4-contrib-dev, wxwin2.4-headers, zlib1g-dev
+Build-Depends: debhelper (>> 4.0.0), autoconf, automake1.7, autotools-dev, cvs, dpatch, bison, docbook-to-man, gawk, gettext, libcrypto++-dev, libglib1.2-dev, libgtk1.2-dev, libexpat1-dev, libwxgtk2.4-dev, libwxgtk2.4-contrib-dev, wxwin2.4-headers, zlib1g-dev
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.6.1.1
 
--- /cvsroot/pkg-xmule/xmule/debian/rules	2005/05/14 17:00:59	1.7
+++ /cvsroot/pkg-xmule/xmule/debian/rules	2005/06/15 13:16:25	1.8
@@ -14,19 +14,19 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CXXFLAGS = -Wall -g
+CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
+	CFLAGS += -O0
 else
-	CXXFLAGS += -O2
+	CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
 ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
-  export CXXFLAGS +=-O0 -mieee
+  export CFLAGS +=-O0 -mieee
 endif
 
 configure:
@@ -36,7 +36,7 @@
 config.status: patch-stamp configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CXXFLAGS="$(CXXFLAGS)" ./configure \
+	CFLAGS="$(CFLAGS)" ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
@@ -66,7 +66,7 @@
 	-$(MAKE) distclean
 	-rm -f debian/xmule.1
 	-rm -f po/*.gmo po/Makefile po/Makefile.in po/POTFILES po/stamp-po
-	-rm -f configure config.* stamp-h1
+	-rm -f configure config.h* stamp-h1
 	-find . -name "*.make" | xargs rm -f
 
 	test -r /usr/share/misc/config.sub && \