From 77f8bdcab63ed130191ad31fbc3dd86ed6b88d2d Mon Sep 17 00:00:00 2001
From: Funda Wang <fwang@mageia.org>
Date: Fri, 6 Jan 2012 14:17:20 +0000
Subject: do not rely on username to generate changelog

---
 ChangeLog | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile  |  4 ++--
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aad147d..a3341cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2012-01-04 16:34  matteo
+
+	* po/it.po: updated Italian translation
+
+2011-12-24 13:46  wally
+
+	* po/fi.po: - updated fi translation
+
+2011-12-23 01:59  dmorgan
+
+	* menu/update-menus.filter: Remove kde3 support in update-menus
+	  filetrigger
+
+2011-12-17 14:56  filip
+
+	* po/sl.po: updated Slovenian translation
+
+2011-12-17 14:41  dglent
+
+	* po/el.po: Update Greek translation
+
+2011-12-17 13:26  obgr_seneca
+
+	* po/de.po: updated German translation
+
+2011-12-15 10:17  fwang
+
+	* po/zh_CN.po: update zh_CN translation
+
+2011-12-15 10:14  fwang
+
+	* bookmarks/konqueror/bookmarks-download.xml: real mageia
+
+2011-12-15 06:39  yurchor
+
+	* po/uk.po: Ukrainian translation update for desktop-common-data
+
+2011-12-15 02:11  fwang
+
+	* Makefile: use xz to compress
+
+2011-12-15 02:10  fwang
+
+	* Makefile: fix wrong path
+
+2011-12-15 02:09  fwang
+
+	* ChangeLog: generate change
+
+2011-12-15 02:02  fwang
+
+	* po/af.po, po/am.po, po/ar.po, po/as.po, po/az.po, po/be.po,
+	  po/bg.po, po/bn.po, po/br.po, po/bs.po, po/ca.po, po/cs.po,
+	  po/cy.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po,
+	  po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fo.po, po/fr.po,
+	  po/fur.po, po/ga.po, po/gl.po, po/gu.po, po/he.po, po/hi.po,
+	  po/hr.po, po/hu.po, po/hy.po, po/id.po, po/is.po, po/it.po,
+	  po/ja.po, po/ka.po, po/kn.po, po/ko.po, po/ku.po, po/ky.po,
+	  po/li.po, po/lo.po, po/lt.po, po/lv.po, po/mi.po, po/mk.po,
+	  po/ml.po, po/mn.po, po/mr.po, po/ms.po, po/mt.po, po/nb.po,
+	  po/nds.po, po/ne.po, po/nl.po, po/nn.po, po/oc.po, po/or.po,
+	  po/pa.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po,
+	  po/sc.po, po/se.po, po/sk.po, po/sl.po, po/sq.po, po/sr.po,
+	  po/ss.po, po/sv.po, po/ta.po, po/tg.po, po/th.po, po/tk.po,
+	  po/tl.po, po/tr.po, po/uk.po, po/ur.po, po/uz.po, po/vi.po,
+	  po/wa.po, po/xh.po, po/yi.po, po/yo.po, po/zh_CN.po, po/zh_TW.po:
+	  merge mandriva translation
+
+2011-12-15 02:01  fwang
+
+	* configure.in: fix typo
+
+2011-12-15 02:01  fwang
+
+	* po/desktop-common-data.pot: generate pot file
+
+2011-12-15 01:46  fwang
+
+	* configure.in, po, po/POTFILES.in: support inltool for translators
+
 2011-12-15 02:02  
 
 	* po/af.po, po/am.po, po/ar.po, po/as.po, po/az.po, po/be.po,
diff --git a/Makefile b/Makefile
index f31dc7d..c1f467f 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ log: ChangeLog
 changelog: ChangeLog
 
 #svn2cl is available in our contrib.
-ChangeLog: ../../common/username.xml
+ChangeLog: 
 	@if test -d "$$PWD/.git"; then \
 	  ../common/gitlog-to-changelog | sed -e '/\tgit-svn-id:.*/d' > $@.tmp \
 	  && mv -f $@.tmp $@ \
@@ -91,6 +91,6 @@ ChangeLog: ../../common/username.xml
 	 echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
 	 (test -f $@ || echo git-log is required to generate this file >> $@)); \
 	else \
-	 svn2cl --accum --authors ../../common/username.xml; \
+	 svn2cl --accum ; \
 	 rm -f *.bak;  \
 	fi;
-- 
cgit v1.2.1