Skip to content
This repository was archived by the owner on Feb 20, 2024. It is now read-only.

Commit 8da03e0

Browse files
author
Jens Lody
committed
* Several changes to debian build-system:
~ Add debian/get-orig-source and debian/get-orig-source-from-svn scripts that create orig-tarballs and remove Windows prebuilt binaries ~ Bump Standards-Version to 3.9.1 Stop shipping *.la files ~ Removed doc-packages, because they can not be build directly from svn-sources, a standalone package might come. ~ debian/control Add cdbs package as Build-Depend Add libbz2-dev and zlib1g-dev packages as Build-Depends (needed by libhelp_plugin.so) Add libboost-dev (>=1.40) as Build-Depends (needed for Nassi-Shneiderman-plugin) Removed Build-Depends for pngnq, wget (was only needed for the removed doc-packages) ~ debian/rules Switch to CDBS rules system Add parallel build support Use lzma compression ~ Added option to keep (or remove) winodows dll's from dist-tarball ~ Some of the changes are based on the work of the ubuntu maintainers, especially Michael Casadevall. git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@6571 2a5c6006-c6dd-42ca-98ab-0921f2732cef
1 parent 020bc28 commit 8da03e0

38 files changed

+3303
-1262
lines changed

‎ChangeLog

+2,655
Large diffs are not rendered by default.

‎ChangeLog.xsl

+22-24
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
</snip>
2323
24-
Copyright (c) 2008 Jens Lody
24+
Copyright (c) 2008-2010 Jens Lody
2525
2626
2727
Usage (replace ++ with two minus signs which aren't allowed
@@ -66,8 +66,6 @@
6666
-->
6767

6868
<!DOCTYPE xsl:stylesheet [
69-
<!ENTITY tab "&#9;">
70-
<!ENTITY newl "&#10;">
7169
<!ENTITY space "&#32;">
7270
]>
7371

@@ -126,7 +124,7 @@
126124
</xsl:otherwise>
127125
</xsl:choose>
128126
<!-- add newlines at the end of the changelog -->
129-
<xsl:text>&newl;</xsl:text>
127+
<xsl:text>&#xA;</xsl:text>
130128
</xsl:template>
131129

132130
<!-- format one entry from the log -->
@@ -156,7 +154,7 @@
156154
<xsl:if test="($prevdate!=$date) or ($prevauthor!=$author)">
157155
<!-- add newline -->
158156
<xsl:if test="not(position()=1)">
159-
<xsl:text>&newl;</xsl:text>
157+
<xsl:text>&#xA;</xsl:text>
160158
</xsl:if>
161159
<!-- date -->
162160
<xsl:value-of select="$date" />
@@ -165,15 +163,15 @@
165163
<!-- author's name -->
166164
<xsl:apply-templates select="author" />
167165
<!-- two newlines -->
168-
<xsl:text>&newl;</xsl:text>
169-
<xsl:if test="$separate-daylogs!='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
166+
<xsl:text>&#xA;</xsl:text>
167+
<xsl:if test="$separate-daylogs!='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
170168
</xsl:if>
171169
</xsl:when>
172170
<!-- write the log header -->
173171
<xsl:otherwise>
174172
<!-- add newline -->
175173
<xsl:if test="not(position()=1)">
176-
<xsl:text>&newl;</xsl:text>
174+
<xsl:text>&#xA;</xsl:text>
177175
</xsl:if>
178176
<!-- date -->
179177
<xsl:apply-templates select="date" />
@@ -182,7 +180,7 @@
182180
<!-- author's name -->
183181
<xsl:apply-templates select="author" />
184182
<!-- two newlines -->
185-
<xsl:text>&newl;&newl;</xsl:text>
183+
<xsl:text>&#xA;&#xA;</xsl:text>
186184
</xsl:otherwise>
187185
</xsl:choose>
188186
<!-- get revision number -->
@@ -198,7 +196,7 @@
198196
<!-- add a line break before the log message -->
199197
<xsl:choose>
200198
<xsl:when test="$breakbeforemsg='yes'">
201-
<xsl:text>&newl;</xsl:text>
199+
<xsl:text>&#xA;</xsl:text>
202200
</xsl:when>
203201
<xsl:when test="number($breakbeforemsg)&gt;0">
204202
<xsl:call-template name="newlines">
@@ -211,7 +209,7 @@
211209
</xsl:call-template>
212210
</xsl:variable>
213211
<!-- add newline here if separate-daylogs is in effect -->
214-
<xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
212+
<xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
215213
<!-- print the message nicely wrapped -->
216214
<xsl:call-template name="wrap">
217215
<xsl:with-param name="txt" select="concat($rev,$msg)" />
@@ -272,23 +270,23 @@
272270
<xsl:param name="txt" />
273271
<xsl:variable name="normtxt" select="normalize-space($txt)" />
274272
<xsl:choose>
275-
<xsl:when test="contains($txt,'&newl;')">
273+
<xsl:when test="contains($txt,'&#xA;')">
276274
<!-- text contains newlines, do the first line -->
277275
<xsl:call-template name="wrap">
278-
<xsl:with-param name="txt" select="substring-before($txt,'&newl;')" />
276+
<xsl:with-param name="txt" select="substring-before($txt,'&#xA;')" />
279277
</xsl:call-template>
280278
<!-- print tab -->
281-
<xsl:text>&tab;&space;&space;</xsl:text>
279+
<xsl:text>&#x9;&space;&space;</xsl:text>
282280
<!-- wrap the rest of the text -->
283281
<xsl:call-template name="wrap">
284-
<xsl:with-param name="txt" select="substring-after($txt,'&newl;')" />
282+
<xsl:with-param name="txt" select="substring-after($txt,'&#xA;')" />
285283
</xsl:call-template>
286284
</xsl:when>
287285
<xsl:when test="(string-length($normtxt) &lt; (($linelen)-9)) or not(contains($normtxt,' '))">
288286
<!-- this is easy, nothing to do -->
289287
<xsl:value-of select="$normtxt" />
290288
<!-- add newline -->
291-
<xsl:text>&newl;</xsl:text>
289+
<xsl:text>&#xA;</xsl:text>
292290
</xsl:when>
293291
<xsl:otherwise>
294292
<!-- find the first line -->
@@ -310,7 +308,7 @@
310308
<!-- print line -->
311309
<xsl:value-of select="$line" />
312310
<!-- print newline and tab -->
313-
<xsl:text>&newl;&tab;&space;&space;</xsl:text>
311+
<xsl:text>&#xA;&#x9;&space;&space;</xsl:text>
314312
<!-- wrap the rest of the text -->
315313
<xsl:call-template name="wrap">
316314
<xsl:with-param name="txt" select="normalize-space(substring($normtxt,string-length($line)+1))" />
@@ -339,26 +337,26 @@
339337
<xsl:param name="txt" />
340338
<xsl:choose>
341339
<!-- find starting newlines -->
342-
<xsl:when test="substring($txt,1,1) = '&newl;'">
340+
<xsl:when test="substring($txt,1,1) = '&#xA;'">
343341
<xsl:call-template name="trim-newln">
344342
<xsl:with-param name="txt" select="substring($txt,2)" />
345343
</xsl:call-template>
346344
</xsl:when>
347345
<!-- find trailing newlines -->
348-
<xsl:when test="substring($txt,string-length($txt),1) = '&newl;'">
346+
<xsl:when test="substring($txt,string-length($txt),1) = '&#xA;'">
349347
<xsl:call-template name="trim-newln">
350348
<xsl:with-param name="txt" select="substring($txt,1,string-length($txt)-1)" />
351349
</xsl:call-template>
352350
</xsl:when>
353351
<!-- if the message has paragrapgs, find the first one -->
354-
<xsl:when test="$reparagraph='yes' and contains($txt,'&newl;&newl;')">
352+
<xsl:when test="$reparagraph='yes' and contains($txt,'&#xA;&#xA;')">
355353
<!-- remove newlines from first paragraph -->
356-
<xsl:value-of select="normalize-space(substring-before($txt,'&newl;&newl;'))" />
354+
<xsl:value-of select="normalize-space(substring-before($txt,'&#xA;&#xA;'))" />
357355
<!-- paragraph separator -->
358-
<xsl:text>&newl;&newl;</xsl:text>
356+
<xsl:text>&#xA;&#xA;</xsl:text>
359357
<!-- do the rest of the text -->
360358
<xsl:call-template name="trim-newln">
361-
<xsl:with-param name="txt" select="substring-after($txt,'&newl;&newl;')" />
359+
<xsl:with-param name="txt" select="substring-after($txt,'&#xA;&#xA;')" />
362360
</xsl:call-template>
363361
</xsl:when>
364362
<!-- remove more single newlines -->
@@ -375,7 +373,7 @@
375373
<!-- insert a number of newlines -->
376374
<xsl:template name="newlines">
377375
<xsl:param name="count" />
378-
<xsl:text>&newl;</xsl:text>
376+
<xsl:text>&#xA;</xsl:text>
379377
<xsl:if test="$count&gt;1">
380378
<xsl:call-template name="newlines">
381379
<xsl:with-param name="count" select="($count)-1" />

‎Makefile.am

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
SUBDIRS = src debian
1+
SUBDIRS = src
2+
3+
4+
if KEEP_DLLS
5+
ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn"
6+
else
7+
ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn" --exclude="*.dll"
8+
endif
9+
10+
am__tar = @am__tar@ $(ADDITIONAL_MAKE_DIST_OPTIONS)
211

312
pkgconfigdir = $(libdir)/pkgconfig
413
pkgconfig_DATA = codeblocks.pc
@@ -8,7 +17,8 @@ EXTRA_DIST = $(top_srcdir)/bootstrap \
817
codeblocks.plist \
918
$(top_srcdir)/BUGS \
1019
$(top_srcdir)/BUILD \
11-
$(top_srcdir)/COMPILERS
20+
$(top_srcdir)/COMPILERS \
21+
debian
1222

1323
clean-zipfiles:
1424
find . -name "*.zip" | xargs rm -f

‎acinclude.m4

+11
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,17 @@ else
197197
AC_MSG_RESULT(no)
198198
fi
199199
200+
AC_MSG_CHECKING(whether to keep prebuild windows dll's in dist-tarball)
201+
keep_dlls_default="yes"
202+
AC_ARG_ENABLE(keep-dlls, [AC_HELP_STRING([--enable-keep-dlls], [keep prebuild windows dll's in dist-tarball (default YES)])],,
203+
enable_keep_dlls=$keep_dlls_default)
204+
AM_CONDITIONAL([KEEP_DLLS], [test "x$enable_keep_dlls" = "xyes"])
205+
if test "x$enable_keep_dlls" = "xyes"; then
206+
AC_MSG_RESULT(yes)
207+
else
208+
AC_MSG_RESULT(no)
209+
fi
210+
200211
201212
case $host in
202213
*-*-cygwin* | *-*-mingw*)

‎configure.in

-2
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,6 @@ AC_CONFIG_FILES([Makefile
500500
codeblocks.pc
501501
codeblocks.spec
502502
codeblocks.plist
503-
debian/Makefile
504-
debian/lintian/Makefile
505503
])
506504

507505
AC_OUTPUT

‎debian/Makefile.am

-23
This file was deleted.

‎debian/changelog

+34
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
codeblocks (10.05svn6571) unstable; urgency=low
2+
3+
* New svn revision
4+
5+
-- Jens Lody <[email protected]> Sun, 05 Sep 2010 09:58:05 +0000
6+
7+
codeblocks (10.05svn6570) unstable; urgency=low
8+
9+
* New svn revision
10+
- Add debian/get-orig-source and debian/get-orig-source-from-svn
11+
scripts that create orig-tarballs and remove Windows prebuilt
12+
binaries
13+
* Bump Standards-Version to 3.9.1
14+
- Stop shipping *.la files
15+
* Removed doc-packages, because they can not be build directly from
16+
svn-sources, a standalone package might come.
17+
* debian/control
18+
- Add cdbs package as Build-Depend
19+
- Add libbz2-dev and zlib1g-dev packages as
20+
Build-Depends (needed by libhelp_plugin.so)
21+
- Add libboost-dev (>=1.40) as Build-Depends (needed
22+
for Nassi-Shneiderman-plugin)
23+
- Removed Build-Depends for pngnq, wget (was only needed for
24+
the removed doc-packages)
25+
* debian/rules
26+
- Switch to CDBS rules system
27+
- Add parallel build support
28+
- Use lzma compression
29+
* Added option to keep (or remove) winodows dll's from dist-tarball
30+
* Some of the changes are based on the work of the ubuntu maintainers,
31+
especially Michael Casadevall.
32+
33+
-- Jens Lody <[email protected]> Fri, 03 Sep 2010 20:38:29 +0000
34+
135
codeblocks (10.05svn6372) unstable; urgency=low
236

337
* tagged svn to 10.05

‎debian/codeblocks-common.install

+19-22
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
1-
usr/share/applications/
1+
usr/share/{icons,pixmaps,mime,applications}
2+
usr/share/man/man1/{codeblocks.1,cb_console_runner.1,cb_share_config.1}
3+
24
usr/share/codeblocks/icons/
3-
usr/share/codeblocks/images/*.png
4-
usr/share/codeblocks/images/16x16
5-
usr/share/codeblocks/images/codecompletion
6-
usr/share/codeblocks/images/settings
5+
usr/share/codeblocks/images/{*.png,16x16,codecompletion,settings}
76
usr/share/codeblocks/lexers
87
usr/share/codeblocks/scripts
98
usr/share/codeblocks/templates
10-
usr/share/codeblocks/astyle.zip*
11-
usr/share/codeblocks/autosave.zip*
12-
usr/share/codeblocks/classwizard.zip*
13-
usr/share/codeblocks/codecompletion.zip*
14-
usr/share/codeblocks/compiler.zip*
15-
usr/share/codeblocks/debugger.zip*
16-
usr/share/codeblocks/defaultmimehandler.zip*
17-
usr/share/codeblocks/manager_resources.zip*
18-
usr/share/codeblocks/openfileslist.zip*
19-
usr/share/codeblocks/projectsimporter.zip*
9+
10+
usr/share/codeblocks/astyle.zip
11+
usr/share/codeblocks/autosave.zip
12+
usr/share/codeblocks/classwizard.zip
13+
usr/share/codeblocks/codecompletion.zip
14+
usr/share/codeblocks/compiler.zip
15+
usr/share/codeblocks/debugger.zip
16+
usr/share/codeblocks/defaultmimehandler.zip
17+
usr/share/codeblocks/manager_resources.zip
18+
usr/share/codeblocks/openfileslist.zip
19+
usr/share/codeblocks/projectsimporter.zip
2020
usr/share/codeblocks/resources.zip
21-
usr/share/codeblocks/scriptedwizard.zip*
21+
usr/share/codeblocks/scriptedwizard.zip
2222
usr/share/codeblocks/start_here.zip
23-
usr/share/codeblocks/todo.zip*
23+
usr/share/codeblocks/todo.zip
24+
2425
usr/share/codeblocks/tips.txt
25-
usr/share/icons/
26-
usr/share/man/man1/cb_*
27-
usr/share/man/man1/codeblocks*
28-
usr/share/mime/
29-
usr/share/pixmaps/
26+
3027
../lintian/codeblocks-common usr/share/lintian/overrides/

‎debian/codeblocks-common.postinst

-6
This file was deleted.

‎debian/codeblocks-contrib-common.install

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
1-
usr/share/codeblocks/AutoVersioning.zip*
2-
usr/share/codeblocks/BrowseTracker.zip*
3-
usr/share/codeblocks/byogames.zip*
4-
usr/share/codeblocks/Cccc.zip*
5-
usr/share/codeblocks/CppCheck.zip*
6-
usr/share/codeblocks/cb_koders.zip*
7-
usr/share/codeblocks/codesnippets.zip*
8-
usr/share/codeblocks/codestat.zip*
9-
usr/share/codeblocks/copystrings.zip*
10-
usr/share/codeblocks/Cscope.zip*
11-
usr/share/codeblocks/DoxyBlocks.zip*
12-
usr/share/codeblocks/dragscroll.zip*
13-
usr/share/codeblocks/EditorTweaks.zip*
14-
usr/share/codeblocks/envvars.zip*
15-
usr/share/codeblocks/exporter.zip*
16-
usr/share/codeblocks/headerfixup.zip*
17-
usr/share/codeblocks/help_plugin.zip*
18-
usr/share/codeblocks/keybinder.zip*
19-
usr/share/codeblocks/lib_finder.zip*
20-
usr/share/codeblocks/NassiShneiderman.zip*
21-
usr/share/codeblocks/Profiler.zip*
22-
usr/share/codeblocks/RegExTestbed.zip*
23-
usr/share/codeblocks/SymTab.zip*
24-
usr/share/codeblocks/ThreadSearch.zip*
25-
usr/share/codeblocks/Valgrind.zip*
26-
usr/share/codeblocks/wxsmith.zip*
27-
usr/share/codeblocks/wxsmithcontribitems.zip*
28-
usr/share/codeblocks/wxSmithAui.zip*
29-
usr/lib/pkgconfig/wxsmithaui.pc
30-
usr/share/codeblocks/HexEditor.zip*
31-
usr/share/codeblocks/IncrementalSearch.zip*
32-
usr/share/codeblocks/MouseSap.zip*
1+
usr/share/codeblocks/AutoVersioning.zip
2+
usr/share/codeblocks/BrowseTracker.zip
3+
usr/share/codeblocks/byogames.zip
4+
usr/share/codeblocks/Cccc.zip
5+
usr/share/codeblocks/CppCheck.zip
6+
usr/share/codeblocks/cb_koders.zip
7+
usr/share/codeblocks/codesnippets.zip
8+
usr/share/codeblocks/codestat.zip
9+
usr/share/codeblocks/copystrings.zip
10+
usr/share/codeblocks/Cscope.zip
11+
usr/share/codeblocks/DoxyBlocks.zip
12+
usr/share/codeblocks/dragscroll.zip
13+
usr/share/codeblocks/EditorTweaks.zip
14+
usr/share/codeblocks/envvars.zip
15+
usr/share/codeblocks/exporter.zip
16+
usr/share/codeblocks/headerfixup.zip
17+
usr/share/codeblocks/help_plugin.zip
18+
usr/share/codeblocks/keybinder.zip
19+
usr/share/codeblocks/lib_finder.zip
20+
usr/share/codeblocks/NassiShneiderman.zip
21+
usr/share/codeblocks/Profiler.zip
22+
usr/share/codeblocks/RegExTestbed.zip
23+
usr/share/codeblocks/SymTab.zip
24+
usr/share/codeblocks/ThreadSearch.zip
25+
usr/share/codeblocks/Valgrind.zip
26+
usr/share/codeblocks/wxsmith.zip
27+
usr/share/codeblocks/wxsmithcontribitems.zip
28+
usr/share/codeblocks/wxSmithAui.zip
29+
usr/share/codeblocks/HexEditor.zip
30+
usr/share/codeblocks/IncrementalSearch.zip
31+
usr/share/codeblocks/MouseSap.zip
3332
usr/share/codeblocks/images/codesnippets*
3433
usr/share/codeblocks/images/DoxyBlocks*
3534
usr/share/codeblocks/images/wxsmith*

0 commit comments

Comments
 (0)