Author Topic: svn4717 breaks the creation of .deb-packages.  (Read 4448 times)

Offline Jenna

  • Administrator
  • Lives here!
  • *****
  • Posts: 7252
svn4717 breaks the creation of .deb-packages.
« on: December 09, 2007, 10:48:12 pm »
The new AutoVersioning-plugin is missing from the appropriate .install file.

I just uploaded the following patch to my server : http://jens.lody.name/debian/patches/debian_dir.patch

If you copy it from this post it may or may not work, because of Dos/Windows line-endings in the original files. So I decided to put a copy on my server.

There are also fixes to depend on wxWidgets 2.8 instead of 2.6, to make sure all installed (C::B) packages have the same version number and some other dependency fixes.


Code
diff -Nru debian/codeblocks-contrib.install debian.work/codeblocks-contrib.install
--- debian/codeblocks-contrib.install   2007-12-09 22:22:57.000000000 +0100
+++ debian.work/codeblocks-contrib.install      2007-12-09 22:12:34.000000000 +0100
@@ -1,3 +1,4 @@
+usr/share/codeblocks/AutoVersioning.zip*
 usr/share/codeblocks/byogames.zip*
 usr/share/codeblocks/cb_koders.zip*
 usr/share/codeblocks/codesnippets.zip*
@@ -15,6 +16,7 @@
 usr/share/codeblocks/wxsmithcontribitems.zip*
 usr/share/codeblocks/images/codesnippets*
 usr/share/codeblocks/images/wxsmith*
+usr/share/codeblocks/plugins/libAutoVersioning.*
 usr/share/codeblocks/plugins/libbyogames.*
 usr/share/codeblocks/plugins/libcb_koders.*
 usr/share/codeblocks/plugins/libcodesnippets.*
diff -Nru debian/control debian.work/control
--- debian/control      2007-12-09 22:22:57.000000000 +0100
+++ debian.work/control 2007-12-09 22:20:20.000000000 +0100
@@ -2,12 +2,12 @@
 Section: x11^M
 Priority: optional^M
 Maintainer: Yiannis Mandravellos <mandrav@codeblocks.org>^M
-Build-Depends: debhelper, autotools-dev, libc6-dev, libstdc++6-4.0-dev, libwxgtk2.6-dev, wx-common, zip^M
-Standards-Version: 3.6.1^M
+Build-Depends: debhelper, autotools-dev, libc6-dev, libstdc++6-4.1-dev | libstdc++6-4.2-dev | libstdc++6-4.3-dev, libwxgtk2.8-dev, wx-common, zip, libgtk2.0-dev^M
+Standards-Version: 3.7.2^M

 Package: libcodeblocks0^M
 Architecture: any^M
-Depends: binutils (>= 2.14.90.0.7), coreutils, file, libc6, libgcc1 (>= 1 ), libmagic1, libncurses5, libstdc++6, zlib1g^M
+Depends: ${shlibs:Depends}, binutils (>= 2.14.90.0.7), file, libmagic1, libncurses5, zlib1g^M
 Description: Code::Blocks shared library^M
  This package contains the Code::Blocks shared library
  .
@@ -15,9 +15,9 @@

 Package: codeblocks^M
 Architecture: any^M
-Depends: libcodeblocks0^M
-Recommends: gcc | g++, gdb, codeblocks-contrib
-Suggests: libwxgtk2.6-dev, wx-common
+Depends: libcodeblocks0 (= ${binary:Version})^M
+Recommends: gcc | g++, gdb, codeblocks-contrib (= ${binary:Version})
+Suggests: libwxgtk2.8-dev, wx-common
 Description: Code::Blocks integrated development environment (IDE)^M
  Code::Blocks is the open-source, cross-platform Integrated Development
  Environment (IDE).^M
@@ -39,7 +39,7 @@

 Package: codeblocks-dbg^M
 Architecture: any
-Depends: codeblocks^M
+Depends: codeblocks (= ${binary:Version})^M
 Description: Code::Blocks debugging libraries^M
  These are the debugging libraries for the 'codeblocks' package.
  .
@@ -47,7 +47,8 @@

 Package: libwxsmithlib0^M
 Architecture: any^M
-Depends: libcodeblocks0^M
+Depends: libcodeblocks0 (= ${binary:Version})^M
+Recommends: codeblocks-contrib (= ${binary:Version})
 Description: wxSmith shared library (wxSmith is a Code::Blocks plugin for RAD GUI editing)^M
  This package contains the wxSmith shared library.
  .
@@ -55,7 +56,7 @@

 Package: codeblocks-contrib^M
 Architecture: any^M
-Depends: codeblocks, libwxsmithlib0^M
+Depends: codeblocks (= ${binary:Version}), libwxsmithlib0 (= ${binary:Version})^M
 Description: Contrib plugins for Code::Blocks IDE^M
  This package extends Code::Blocks functionality a great deal with the included
  plugins. These are:^M
@@ -69,13 +70,14 @@
     * GUI RAD builder (wxSmith)
     * Selection of small games for relaxing between coding sessions! (BYOGames)
     * WYSIWYG forms designer for wxWidgets (wxSmith)^M
+    * Autoversioning
  .
  http://www.codeblocks.org

 Package: codeblocks-dev^M
 Architecture: any
 Section: devel^M
-Depends: libcodeblocks0^M
+Depends: libcodeblocks0 (= ${binary:Version})^M
 Description: Code::Blocks development files (SDK)^M
  Contains the development files (headers and libraries) for creating
  Code::Blocks plugins.
@@ -85,7 +87,7 @@
 Package: libwxsmithlib0-dev^M
 Architecture: any
 Section: devel^M
-Depends: libcodeblocks0^M
+Depends: libcodeblocks0 (= ${binary:Version})^M
 Description: wxSmith development files^M
  Contains the development libraries for wxSmith (Code::Blocks plugin)
  .
diff -Nru debian/rules debian.work/rules
--- debian/rules        2007-12-09 22:22:57.000000000 +0100
+++ debian.work/rules   2007-12-09 22:22:01.000000000 +0100
@@ -54,7 +54,7 @@
        rm -f build-stamp

        # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif

Offline killerbot

  • Administrator
  • Lives here!
  • *****
  • Posts: 5529
Re: svn4717 breaks the creation of .deb-packages.
« Reply #1 on: December 09, 2007, 11:12:21 pm »
committed the parts related to AutoVersioning. The other stuff is unknown to me. @Yiannis : your attention needed ;-)