Commit graph

24 commits

Author SHA1 Message Date
b7cd95bcc9 Bug 10802: make Debian package install history.txt
While bug 8911 fixed a problem regarding history.txt, a proper fix for
packages was missing.
This patch does three things:

 - Adds docs/history.txt to debian/koha-common.docs so it gets installed.
 - Moves the line installing the release notes from debian/koha-common.install
   to debian/koha-common.docs.
 - Adds an override_dh_compress entry in debian/rules that excludes
   history.txt from the dh_compress routine [1]

To test:
 - Take a picture of how /usr/share/doc/koha-common looks.
 - Apply the patch and build a package.
 - Upgrade and/or install using your package.
 - Look for the contents of the /usr/share/doc/koha-common, it should
   look the same, but history.txt must be there.
 - More > About Koha > Koha Timeline should show the history lines.

[1] As 'man dh_compress' says, it is needed as every file considered for
    the doc dir that is plain text and is more than 4k size will be
    gzipped unless stated otherwise. We need it uncompressed for about.pl.

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-16 15:27:16 +00:00
Robin Sheat
55f3553b25 Bug 10367 - update the rules and control file for wheezy
This updates the control file to use tinymce rather than tinymce2, as
tinymce2 is deprecated and no longer in Debian.

Also a general dependencies update. Note that this is suitable for
master only.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 08:08:30 -07:00
be1770ffcc Bug 10084 - YUI path wrong in CCSR theme with packages
Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday).

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Worked fine in my test package, good work Tomas
Signed-off-by: Mason James <mtj@kohaaloha.com>

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-02 15:12:03 -07:00
Robin Sheat
15f58c257f Bug 10061 - Fix tinymce path references broken by bug 9172
Only affects the package builds

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-04-16 08:14:59 -07:00
Robin Sheat
c9172f49c8 Bug 9802 - add test case to ensure man pages have correct XML
To test:
* run xt/verify-debian-docbook.t and make sure it's all OK
* modify an xml file in debian/docs, try again, make sure it fails

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
- Running "prove -v xt/verify-debian-docbook.t" loops through all the
  XML files in debian/docs and reports them as being ok.
- Removing a "<" from one of the files makes the test report it as
  an error
- I did not verify that the test actually trips up a package build
  if there is invalid XML.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-20 15:11:10 -04:00
Robin Sheat
d5cfa12864 Bug 9052 - rewrite the YUI links to use the system library
This uses libjs-yui to provide the skin.css and reset-fonts-grids.css
files from YUI. It patches the CSS files to point to the right location
for the files.

To test:
* Build a package with this patch included
* Install it
* Look at the OPAC and note that things no longer look terrible, and
  that there are no 404's coming from bad CSS URLs.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
I created a package of 3.10+9052, installed and tested.
I confirm that the OPAC does not look broken anymore
and I could not find 404 errors with Firebug.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I also created a package of 3.10+9052 and removed libchi-* from the
debian/control file. The OPAC shows no problems using those packages,
layout, pictures and colors seem to all be in place.
Also the OPAC on master with patch applied still works as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-17 09:03:36 -05:00
Paul Poulain
4f44847c11 Merge remote-tracking branch 'origin/new/bug_8233' 2012-10-05 12:00:06 +02:00
e11d31cb2c Bug 8233 - SolR-related /etc/ files break deb building
Remove them using debian/rules when building .deb packages until
we figure out what to do with them in a .deb install.

To do this I ran the build script like this:

sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-10-05 11:59:50 +02:00
Paul Poulain
6760dc0f17 Merge remote-tracking branch 'origin/new/bug_8623' 2012-10-05 11:49:08 +02:00
9f98800b99 Bug 8623 - Fix YUI path for OPAC in debian/rules
After the changes to YUI path the build process is broken. For testing this I had
to set the build process to ommit the tests as there are some db_dependent test being
called (which failed).

To do this I ran the build script like this:

sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d

Note: Even when this is fixed, there are still issues with some files missing

dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: missing files, aborting
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

Sponsored-by: Universidad Nacional de Córdoba

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Please note that debian/rules *must* use tabs. If you have a git hook
that automatically replaces tabs with spaces, please undo those changes.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:47:51 +02:00
f114d31631 Bug 7589 - tinymce editor broken in .deb packages - in 'en' templates
this patch fixes a glitchy symlink to tiny_mce

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Note that you have to *remove* koha-common then install fresh in order
to recreate the symlink.

VERY IMPORTANT!!! debian/rules MUST USE TABS. USE -n WHEN COMMITING
THIS PATCH, AND DO NOT REPLACE TABS WITH SPACES.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-03 17:36:21 +02:00
Robin Sheat
831e14e89e Bug 7238 - make packages deal with SIP config
This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 17:23:08 +01:00
Robin Sheat
9d3a8d9865 Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
This uses the docbook source files to generate the man pages, and
installs them to their correct location when the packages are being
built.

This will make it easier for people to write man pages, thereby ensuring
that people join in keeping documentation up to date.

Note: adds docbook-xsl and xsltproc to the dependencies.
Note2: applies on top of Magnus' other patch on this ticket.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-16 13:51:26 +12:00
Robin Sheat
c779f2b380 Bug 6361 - make the packages work with koha 3.4
This commit does the following:
* Merge the changelog from the releases of 3.2
* Adds a command 'koha-upgrade-to-3.4' that does the MARC item splitting
  stuff.
* Adds a debconf note to make sure people know that they need to run
  the above command.
* Fixes the inclusion of jQuery in the packages.
* Makes build-git-snapshot build packages with a 3.5 version.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 11:06:31 +12:00
Robin Sheat
618b092a5e bug 4953 - make the debian package copy in YUI images
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-07 12:05:20 -04:00
Lars Wirzenius
6340d22468 Replace dependencies on koha-dev-env with list of packages.
The dependencies are needed both at build time and at run time. Build
time needs them for running tests. To avoid duplicating the (long!)
list of dependencies, we do a little bit of trickery, and generate
a koha:Depends substvar, from all build dependencies (except debhelper),
and use ${koha:Depends} in the koha-common (not koha) Depends header.
A little bit tricky, but works.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 07:59:12 -04:00
Lars Wirzenius
27c6ab764c Split off koha-common.
koha-common will be suitable for hosts with multiple Koha instances,
or those that otherwise need to do thing differently from the main
koha package.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 07:58:56 -04:00
Lars Wirzenius
704754db0c Bugfix: Install old yui stylesheets, since Koha needs them.
Also fix paths, since we can't install them where Koha expects them,
since that location is used by the Debian packaged yui.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 07:57:32 -04:00
Lars Wirzenius
f585e88472 Bugfix: Create the jquery.js symlink for opac to the right target.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 07:57:07 -04:00
Lars Wirzenius
97232eee15 Replace old, non-functional Debian packaging with a new one.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 00:41:54 -04:00
b70b86f36d More work on packaging
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:57 -05:00
8dd1550c1d Fixing some bugs in the package, updating dependencies
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:57 -05:00
e3fd1083f8 Still working
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:57 -05:00
1becfc76eb More packaging work
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:57 -05:00