aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--Makefile4
2 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b99278f..d79e2e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-11-17 14:37
+
+ * bookmarks/konqueror/bookmarks-download.xml,
+ bookmarks/mozilla/mozilla-download.html: remove Mandriva link for
+ Mageia wiki (bug #3199)
+
+2011-11-17 14:37
+
+ * bookmarks/konqueror/bookmarks-download.xml,
+ bookmarks/mozilla/mozilla-download.html: remove Mandriva link for
+ Mageia wiki (bug #3199)
+
+2011-05-20 20:29
+
+ * desktop/default/register.desktop.in: change registry link
+
+2011-04-29 00:06
+
+ * ChangeLog, menu/icons/large/mageia.png, menu/icons/mageia.png,
+ menu/icons/mini/mageia.png: - Update mageia.png icons (use the
+ same icon as register-mga.png)
+
2011-04-29 01:57
* mageia.png: update mageia.png icons (use the same icon as
diff --git a/Makefile b/Makefile
index a61455b..861534f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ clean:
# rules to build a distributable rpm
-dist: menus checktag clean changelog tag
+dist: menus checktag clean changelog
rm -rf ../$(NAME)-$(VERSION)*.tar* $(NAME)-$(VERSION)
@if [ -e ".svn" ]; then \
$(MAKE) dist-svn; \
@@ -79,7 +79,7 @@ log: ChangeLog
changelog: ChangeLog
#svn2cl is available in our contrib.
-ChangeLog: ../common/username.xml
+ChangeLog: ../../common/username.xml
@if test -d "$$PWD/.git"; then \
../common/gitlog-to-changelog | sed -e '/\tgit-svn-id:.*/d' > $@.tmp \
&& mv -f $@.tmp $@ \