Copy debian changes from 1.105b launchpad package
Remove hsqldb.jar, add libhsqldb-java dependency Update java dependencies Set bootclasspath for 1.7 Add stub-jars-debian target to use from rules Add debian-alt dir Update package description Fix compiler warning
This commit is contained in:
3
CHANGES
3
CHANGES
@ -1,5 +1,8 @@
|
||||
[Version key: $major.$minor$type, $type: a(lpha), b(eta), r(elease)c(andidate)]
|
||||
|
||||
* 2016-10-19 1.10tbd (zzz)
|
||||
- Debian packaging fixes
|
||||
|
||||
* 2016-08-14 1.107b-0 (zzz)
|
||||
- Add 'Lazy Edward' default archive
|
||||
|
||||
|
||||
55
build.xml
55
build.xml
@ -112,7 +112,6 @@
|
||||
<attribute name="name" default="" />
|
||||
<attribute name="type-class" />
|
||||
<attribute name="additional" default=""/>
|
||||
|
||||
<sequential>
|
||||
<jar destfile="${pkgtemp.dir}/bin/syndie@{name}.jar">
|
||||
<manifest>
|
||||
@ -126,6 +125,23 @@
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<macrodef name="make-stub-jar-debian">
|
||||
<attribute name="name" default="" />
|
||||
<attribute name="type-class" />
|
||||
<attribute name="additional" default=""/>
|
||||
<sequential>
|
||||
<jar destfile="${pkgtemp.dir}/bin/syndie@{name}.jar">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="@{type-class}" />
|
||||
<attribute name="Class-Path" value="${i2p.jar} ${hsqldb.jar} /usr/share/syndie/syndie.jar @{additional}" />
|
||||
<attribute name="Built-By" value="${build.built-by}" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<macrodef name="repack">
|
||||
<attribute name="jarname" />
|
||||
<sequential>
|
||||
@ -514,6 +530,7 @@
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<!-- note hardcoded hsqldb path, won't work for debian -->
|
||||
<target name="jar-cli" depends="compile-cli" description="Build jar with only the cli in ./build">
|
||||
<property name="build.built-by" value="unknown" />
|
||||
<jar jarfile="${build.dir}/syndie-cli.jar">
|
||||
@ -934,6 +951,13 @@
|
||||
<make-stub-jar name="-cli" type-class="${cli.class}" />
|
||||
</target>
|
||||
|
||||
<!-- use this target from debian/rules -->
|
||||
<target name="stub-jars-debian" depends="jar, preppkg-debian" description="Create manifest-only jars for Syndie">
|
||||
<make-stub-jar-debian name="-desktop" additional="${swt.jar}" type-class="${desktop.class}" />
|
||||
<make-stub-jar additional="${swt.jar}" type-class="${tabs.class}" />
|
||||
<make-stub-jar name="-cli" type-class="${cli.class}" />
|
||||
</target>
|
||||
|
||||
<target name="preppkg" depends="prep-docs, jar">
|
||||
<copy file="${swt.jar}" tofile="${pkgtemp.dir}/lib/swt.jar" />
|
||||
<copy file="${hsqldb.jar}" todir="${pkgtemp.dir}/lib" />
|
||||
@ -941,7 +965,19 @@
|
||||
<copy file="${build.dir}/syndie.jar" todir="${pkgtemp.dir}/lib" />
|
||||
</target>
|
||||
|
||||
<target name="prep-docs">
|
||||
<target name="preppkg-debian" depends="prep-docs-debian, jar">
|
||||
<copy file="${build.dir}/syndie.jar" todir="${pkgtemp.dir}/lib" />
|
||||
</target>
|
||||
|
||||
<target name="prep-docs" depends="prep-docs-debian">
|
||||
<copy file="lib/hsqldb_lic.txt" todir="${pkgtemp.dir}/doc/licenses" />
|
||||
<replaceregexp file="${pkgtemp.dir}/doc/LICENSE" byline="true"
|
||||
match="lib/hsqldb_lic.txt"
|
||||
replace="licenses/hsqldb_lic.txt">
|
||||
</replaceregexp>
|
||||
</target>
|
||||
|
||||
<target name="prep-docs-debian">
|
||||
<copy todir="${pkgtemp.dir}/bin">
|
||||
<fileset dir="./bin" />
|
||||
</copy>
|
||||
@ -952,7 +988,6 @@
|
||||
<fileset dir="doc/web" />
|
||||
</copy>
|
||||
<copy file="LICENSE" todir="${pkgtemp.dir}/doc/"/>
|
||||
<copy file="lib/hsqldb_lic.txt" todir="${pkgtemp.dir}/doc/licenses" />
|
||||
<copy todir="${pkgtemp.dir}/doc/licenses">
|
||||
<fileset dir="doc/licenses/" excludes="SWT/**" />
|
||||
</copy>
|
||||
@ -960,10 +995,6 @@
|
||||
match="doc/licenses/"
|
||||
replace="licenses/">
|
||||
</replaceregexp>
|
||||
<replaceregexp file="${pkgtemp.dir}/doc/LICENSE" byline="true"
|
||||
match="lib/hsqldb_lic.txt"
|
||||
replace="licenses/hsqldb_lic.txt">
|
||||
</replaceregexp>
|
||||
</target>
|
||||
|
||||
|
||||
@ -1031,6 +1062,8 @@
|
||||
<tarfileset dir="../${ant.project.name}-${syndie.release.version}" prefix="${ant.project.name}-${syndie.release.version}">
|
||||
<include name="**/**" />
|
||||
<exclude name="debian/**"/>
|
||||
<exclude name="debian-alt/**"/>
|
||||
<exclude name="lib/**"/>
|
||||
<exclude name="**/*.sh"/>
|
||||
</tarfileset>
|
||||
<tarfileset dir="../${ant.project.name}-${syndie.release.version}" prefix="${ant.project.name}-${syndie.release.version}" filemode="755">
|
||||
@ -1040,6 +1073,14 @@
|
||||
</tar>
|
||||
</target>
|
||||
|
||||
<target name="debian-binary">
|
||||
<exec executable="fakeroot" failonerror="true">
|
||||
<arg value="debian/rules" />
|
||||
<arg value="clean" />
|
||||
<arg value="binary" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="debian-tarball" depends="source-tarball">
|
||||
<copy verbose="true" file="${source.tarball.name}"
|
||||
tofile="../${ant.project.name}_${syndie.release.version}.orig.tar.bz2" />
|
||||
|
||||
90
debian-alt/trusty/changelog
Normal file
90
debian-alt/trusty/changelog
Normal file
@ -0,0 +1,90 @@
|
||||
syndie (1.107b-1ubuntu1) trusty; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- zzz on i2p <zzz@i2pmail.org> Tue, 19 Oct 2016 12:12:12 +0000
|
||||
|
||||
syndie (1.105b-1ubuntu1) saucy; urgency=medium
|
||||
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 10 Feb 2014 22:25:02 +0000
|
||||
|
||||
syndie (1.105b-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 10 Feb 2014 00:00:59 +0000
|
||||
|
||||
syndie (1.103b-4) unstable; urgency=low
|
||||
|
||||
* French, Spanish, and Swedish translation updates
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 12 Oct 2013 21:46:06 +0000
|
||||
|
||||
syndie (1.103b-3saucy1) saucy; urgency=low
|
||||
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 25 Aug 2013 21:46:22 +0000
|
||||
|
||||
syndie (1.103b-3) unstable; urgency=low
|
||||
|
||||
* Bump dependencies on hsqldb in Saucy and Sid. Fixes #1006
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 25 Aug 2013 21:41:50 +0000
|
||||
|
||||
syndie (1.103b-2) unstable; urgency=low
|
||||
|
||||
* Add dependecy on libswt-cairo-gtk-3-jni
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 22 May 2013 23:54:34 +0000
|
||||
|
||||
syndie (1.103b-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 03 Feb 2013 19:16:09 +0000
|
||||
|
||||
syndie (1.101~b8-3) unstable; urgency=low
|
||||
|
||||
* Don't include swt.jar in syndie.jar.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 30 May 2012 16:04:40 +0000
|
||||
|
||||
syndie (1.101~b8-2) unstable; urgency=low
|
||||
|
||||
* Add libswt-gtk-3-java as a valid swt alternate
|
||||
* Bump standards version (no source changes needed)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 23 May 2012 13:37:25 +0000
|
||||
|
||||
syndie (1.101~b8-1) unstable; urgency=low
|
||||
|
||||
* New upstream beta
|
||||
- add web server support for HEAD, for shared files only
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 28 May 2011 23:43:41 +0000
|
||||
|
||||
syndie (1.101~b7-3) unstable; urgency=low
|
||||
|
||||
* Change dependencies to i2p-router | i2p
|
||||
* Remove newly deprecated build-dep on default-jdk-builddep
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 27 May 2011 01:51:01 +0000
|
||||
|
||||
syndie (1.101~b7-2) unstable; urgency=low
|
||||
|
||||
* Explicitly set Djava.library.path in startup script (thanks for your help
|
||||
A.D.)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 29 Apr 2011 09:21:49 +0000
|
||||
|
||||
syndie (1.101~b7-1) unstable; urgency=low
|
||||
|
||||
* Initial packaging
|
||||
* Removing defunct Syndie archives from Welcome screen
|
||||
* Set classpath in syndie start-up script with the contents of the message at
|
||||
urn:syndie:channel:d7:channel44:mRUEvztbna1ed978nlQh-A44rK8XwXs~dNj8YPFn6Fc=9:messageIdi1172093191594ee
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 25 Apr 2011 23:41:26 +0000
|
||||
115
debian/changelog
vendored
115
debian/changelog
vendored
@ -1,87 +1,50 @@
|
||||
syndie (1.102b-3-1) unstable; urgency=low
|
||||
syndie (1.107b-1ubuntu1) trusty; urgency=medium
|
||||
|
||||
* New beta build from the Syndie Hackfest.
|
||||
* Upstream changelog:
|
||||
* GUI improvements:
|
||||
- Add background image to browsser tab during startup
|
||||
- Speed up browser tab display at startup by several seconds,
|
||||
by putting new message search into a JobRunner thread
|
||||
- Sort forums in new message button
|
||||
- Display SyndicatorTab on startup if we closed with no tabs
|
||||
- Limit number of old tabs displayed on startup
|
||||
Fixes:
|
||||
- Fixes to reduce the number of messages pushed to archives:
|
||||
Use the apparent message date instead of the import date to determine what's too
|
||||
old to push, so we don't push ancient stuff we just pulled to another server.
|
||||
Fix bug where max age was multiplied by 7.
|
||||
HTTP Server:
|
||||
- Reject requests via inproxies
|
||||
Build:
|
||||
- OSX fixes
|
||||
- Several new targets, cleanups
|
||||
* New upstream release
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 08 Jan 2013 20:24:14 +0000
|
||||
-- zzz on i2p <zzz@i2pmail.org> Tue, 19 Oct 2016 12:12:12 +0000
|
||||
|
||||
syndie (1.102b-2-1) unstable; urgency=low
|
||||
syndie (1.105b-1ubuntu1) saucy; urgency=medium
|
||||
|
||||
* New beta build from the Syndie Hackfest.
|
||||
* Update changes
|
||||
* Default changes for better new experience:
|
||||
- Change default display filter from 6 months to 10 years
|
||||
* GUI improvements:
|
||||
- Better feedback in SyndicatorTab by adding
|
||||
progress and total size in bytes for message and index fetches.
|
||||
Total size only listed for pushes (for now).
|
||||
- Change page header if no items to display in MessageTree,
|
||||
so you don't think maybe it's loading.
|
||||
- Add message counts and other info to ReferenceChooserTree;
|
||||
change font based on message count
|
||||
- Add message counts to StatusBar new messages popup
|
||||
- Try to display channels consistently in the bottom status bar popups
|
||||
and the ReferenceChooserTree
|
||||
- Mark a message as read when you read it (change default to true)
|
||||
* Fixes:
|
||||
- Catch 'widget is disposed' exceptions,
|
||||
possibly preventing pushes from working
|
||||
* Build:
|
||||
- Add depend task for better dependency checking
|
||||
- Don't copy data files to build dir
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 08 Jan 2013 20:21:22 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 10 Feb 2014 22:25:02 +0000
|
||||
|
||||
syndie (1.102b-1-1) unstable; urgency=low
|
||||
syndie (1.105b-1) unstable; urgency=medium
|
||||
|
||||
* New beta version from the Syndie Hackfest!!!!!!
|
||||
* Upstream changelog:
|
||||
* Default changes for better new experience:
|
||||
- Change default master sync time from 24 + 0-24 hours to 5 + 0-1
|
||||
- Change default archive sync time from 24 hours to 4 hours
|
||||
- Change default pull policy from server's time to 6 months
|
||||
- Change default search and display filters from 1 week to 6 months
|
||||
- Add more filter age options
|
||||
- Update default archives
|
||||
- Set default i2p archives to auto-sync
|
||||
* GUI improvements:
|
||||
- Improve wizard text
|
||||
- Re-enable spellcheck (still doesn't work though)
|
||||
- Limit number of fetches or pushes shown, to not slow down the UI too much
|
||||
- Detailed interactive status in fetches and pushes section
|
||||
* Fixes:
|
||||
- Fix wizard screen width (ticket #461)
|
||||
- Fix NPE when viewing a draft on a banned forum
|
||||
- Fix HTTP Server error (SocketTimeout incompatibility with older i2p.jar)
|
||||
- Fix error posting private messages
|
||||
- Fix occasional failure of httpserv at startup
|
||||
- Fix "Data already set" internal error when importing posts with
|
||||
hidden authors and an authentication mask
|
||||
* Sync improvements:
|
||||
- Randomize order of archives when syncing
|
||||
* Build:
|
||||
- Move all bundled resources from src/ to data/
|
||||
* Other:
|
||||
- Clean up some expensive debug logging
|
||||
* New upstream release
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 06 Jan 2013 18:21:47 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 10 Feb 2014 00:00:59 +0000
|
||||
|
||||
syndie (1.103b-4) unstable; urgency=low
|
||||
|
||||
* French, Spanish, and Swedish translation updates
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 12 Oct 2013 21:46:06 +0000
|
||||
|
||||
syndie (1.103b-3saucy1) saucy; urgency=low
|
||||
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 25 Aug 2013 21:46:22 +0000
|
||||
|
||||
syndie (1.103b-3) unstable; urgency=low
|
||||
|
||||
* Bump dependencies on hsqldb in Saucy and Sid. Fixes #1006
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 25 Aug 2013 21:41:50 +0000
|
||||
|
||||
syndie (1.103b-2) unstable; urgency=low
|
||||
|
||||
* Add dependecy on libswt-cairo-gtk-3-jni
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 22 May 2013 23:54:34 +0000
|
||||
|
||||
syndie (1.103b-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 03 Feb 2013 19:16:09 +0000
|
||||
|
||||
syndie (1.101~b8-3) unstable; urgency=low
|
||||
|
||||
|
||||
9
debian/control
vendored
9
debian/control
vendored
@ -3,17 +3,18 @@ Section: java
|
||||
Priority: extra
|
||||
Maintainer: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Build-Depends: debhelper (>= 7.0.50~)
|
||||
Build-Depends-Indep: ant, default-jdk, libswt-gtk-3-java | libswt-gtk-3.6-java | libswt-gtk-3.5-java , libhsqldb-java, i2p-router | i2p
|
||||
Build-Depends-Indep: ant, openjdk-7-jdk, libswt-gtk-3-java, libhsqldb-java, i2p-router | i2p
|
||||
Standards-Version: 3.9.3
|
||||
Homepage: http://syndie.i2p2.de
|
||||
|
||||
Package: syndie
|
||||
Architecture: all
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, default-jre | java5-runtime | java6-runtime, libhsqldb-java,
|
||||
libswt-gtk-3.5-java | libswt-gtk-3.6-java | libswt-gtk-3-java, libhsqldb-java, i2p-router | i2p
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends},
|
||||
openjdk-9-jre | openjdk-8-jre | openjdk-7-jre | default-jre | java9-runtime | java8-runtime | java7-runtime,
|
||||
libswt-gtk-3-java, libhsqldb-java, i2p-router | i2p
|
||||
Suggests: tor, freenet
|
||||
Enhances: tor, i2p-router, i2p
|
||||
Description: open source system for operating distributed forums
|
||||
Description: Syndie anonymous distributed forums
|
||||
Syndie is java-based open source system for operating secure distributed
|
||||
forums.
|
||||
.
|
||||
|
||||
16
debian/rules
vendored
16
debian/rules
vendored
@ -13,19 +13,25 @@
|
||||
dh $@
|
||||
|
||||
override_dh_auto_build:
|
||||
ant jar
|
||||
ant stub-jars-debian -Dlib.dir=/usr/share/java -Di2p.jar=/usr/share/i2p/lib/i2p.jar -Djavac.version=1.7 '-Djavac.compilerargs=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar'
|
||||
chmod 755 pkg-temp/bin/*.jar
|
||||
mv pkg-temp/bin/syndie-cli.jar pkg-temp/bin/syndie-cli
|
||||
mv pkg-temp/bin/syndie.jar pkg-temp/bin/syndie
|
||||
mv pkg-temp/bin/syndie-desktop.jar pkg-temp/bin/syndie-desktop
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_clean
|
||||
ant clean
|
||||
rm -f $(CURDIR)/syndie.jar
|
||||
ant distclean
|
||||
|
||||
override_dh_install:
|
||||
dh_install
|
||||
install -d $(CURDIR)/debian/syndie/usr/bin
|
||||
install -m 755 $(CURDIR)/debian/syndie.sh $(CURDIR)/debian/syndie/usr/bin/syndie
|
||||
# install -d $(CURDIR)/debian/syndie/usr/bin
|
||||
# install -m 755 $(CURDIR)/debian/syndie.sh $(CURDIR)/debian/syndie/usr/bin/syndie
|
||||
|
||||
override_dh_installdocs:
|
||||
dh_installdocs
|
||||
mv $(CURDIR)/debian/syndie/usr/share/doc/syndie/web \
|
||||
$(CURDIR)/debian/syndie/usr/share/doc/syndie/html
|
||||
|
||||
override_dh_fix_perms:
|
||||
dh_fixperms -Xsyndie.jar -Xsyndie-cli.jar -Xsyndie-desktop.jar
|
||||
|
||||
10
debian/syndie-desktop.desktop
vendored
Normal file
10
debian/syndie-desktop.desktop
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Name=Syndie - Secure Distributed Forums (alternative UI)
|
||||
Comment=Distributed forum/blog reader
|
||||
Exec=syndie-desktop
|
||||
Icon=syndie
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Network;
|
||||
StartupNotify=true;
|
||||
4
debian/syndie.examples
vendored
4
debian/syndie.examples
vendored
@ -1 +1,3 @@
|
||||
bin/*
|
||||
bin/bulkimport.syndie
|
||||
bin/httpgetdist.syndie
|
||||
bin/runhttpserv.syndie
|
||||
|
||||
7
debian/syndie.install
vendored
7
debian/syndie.install
vendored
@ -1,4 +1,7 @@
|
||||
dist/syndie.jar usr/share/syndie
|
||||
lib/servlet.jar usr/share/syndie
|
||||
build/syndie.jar usr/share/syndie
|
||||
pkg-temp/bin/syndie-cli usr/bin
|
||||
pkg-temp/bin/syndie-desktop usr/bin
|
||||
pkg-temp/bin/syndie usr/bin
|
||||
debian/syndie.xpm usr/share/pixmaps
|
||||
debian/syndie.desktop usr/share/applications
|
||||
debian/syndie-desktop.desktop usr/share/applications
|
||||
|
||||
1
debian/syndie.links
vendored
1
debian/syndie.links
vendored
@ -1 +0,0 @@
|
||||
usr/share/syndie/syndie.jar usr/share/java/syndie.jar
|
||||
@ -35,8 +35,6 @@ public class TextUI implements UI {
|
||||
} catch (UnsupportedEncodingException uee) {
|
||||
errorMessage("internal error, your JVM doesn't support UTF-8?", uee);
|
||||
throw new RuntimeException("Broken JVM");
|
||||
} catch (IOException ioe) {
|
||||
ioe.printStackTrace();
|
||||
}
|
||||
}
|
||||
private static final class NullOutputStream extends OutputStream {
|
||||
|
||||
Reference in New Issue
Block a user