Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv31027
Modified Files:
changelog rules
Log Message:
Don't ignore MANIFEST changes just because MOZILLA=n. Only ignore it
for the backport. Otherwise it is supposed to be specified manually.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- changelog 30 Sep 2003 16:12:10 -0000 1.190
+++ changelog 30 Sep 2003 17:46:53 -0000 1.191
@@ -37,8 +37,6 @@
Jerome Warnier [RE]
+ move installing of the mozilla files into debian/rules surrounded
by a conditional... [RE]
- + export IGNORE_MANIFEST_CHANGES too when specifying MOZILLA=n manually
- [RE]
+ add pieces to uudecode the Ximian icons and to restore the old ones
after the build.. [MK, RE]
+ make apply.pl executable in patch.unapply too... (closes: #213309) [MK]
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- rules 30 Sep 2003 15:03:19 -0000 1.129
+++ rules 30 Sep 2003 17:46:53 -0000 1.130
@@ -98,9 +98,6 @@
else
ifneq "$(MOZILLA)" "n"
CONFIGURE_FLAGS+= --enable-mozilla
- else
- IGNORE_MANIFEST_CHANGES=1
- export IGNORE_MANIFEST_CHANGES
endif
endif
