New upstream release 0.4.1 + svn snapshot r262.
authorgregor herrmann <gregoa@debian.org>
Sat, 22 Jan 2011 12:15:28 +0000 (12:15 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 22 Jan 2011 12:15:28 +0000 (12:15 -0000)
21 files changed:
debian/README.Debian [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/clean [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/fosdem-schedule.docs [new file with mode: 0644]
debian/fosdem-schedule.install [new file with mode: 0644]
debian/fosdem-schedule.manpages [new file with mode: 0644]
debian/fosdem-schedule.menu [new file with mode: 0644]
debian/fosdem-schedule.pod [new file with mode: 0644]
debian/get-orig-source [new file with mode: 0644]
debian/patches/desktop.patch [new file with mode: 0644]
debian/patches/hildon.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/repack.local [new file with mode: 0644]
debian/repack.stub [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source.lintian-overrides [new file with mode: 0644]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..dce475b
--- /dev/null
@@ -0,0 +1 @@
+If you get SQL errors on startup, try removing ~/.fosdem/fosdem.sqlite.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..3a4e463
--- /dev/null
@@ -0,0 +1,17 @@
+fosdem-schedule (0.4.1+svn262+ds-1) UNRELEASED; urgency=low
+
+  * New upstream release 0.4.1 + svn snapshot r262.
+  * Refresh desktop.patch.
+  * debian/copyright: add third party files and update formatting.
+  * Switch to source format 3.0 (quilt).
+  * Set Standards-Version to 3.9.1 (no changes).
+  * debhelper knows about qmake; bump required version in debian/control,
+    adjust debian/rules.
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 22 Jan 2011 13:11:19 +0100
+
+fosdem-schedule (0.3+ds-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 03 Feb 2010 21:32:27 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..99773cf
--- /dev/null
@@ -0,0 +1,2 @@
+debian/fosdem-schedule.1
+debian/fosdem-schedule.xpm
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..e40d115
--- /dev/null
@@ -0,0 +1,20 @@
+Source: fosdem-schedule
+Section: utils
+Priority: extra
+Maintainer: gregor herrmann <gregoa@debian.org>
+Build-Depends: debhelper (>= 7.4.12~), imagemagick,
+ libqt4-dev (>= 4:4.5), libqt4-sql-sqlite (>= 4:4.5)
+Standards-Version: 3.9.1
+Homepage: http://sourceforge.net/projects/fosdem-maemo/
+Vcs-Svn: http://svn.toastfreeware.priv.at/debian/fosdem-schedule/trunk/
+Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/fosdem-schedule/trunk/
+
+Package: fosdem-schedule
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-sql-sqlite (>= ${sqlite:Depends})
+Description: FOSDEM schedule application
+ fosdem-schedule makes the FOSDEM conference schedule available offline. It
+ displays the conference schedule from various views, support searches on
+ various items (speaker, speech topic, location, etc.) and enables you to
+ select favorite events and create your own schedule.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..3dbe877
--- /dev/null
@@ -0,0 +1,59 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: fosdem-maemo
+Upstream-Contact: Matus Uzak <matus.uzak@ixonos.com>
+Source: https://fosdem-maemo.svn.sourceforge.net/svnroot/fosdem-maemo/trunk
+
+Files: *
+Copyright: 2010, Ixonos Plc.
+License: GPL-2+
+
+Files: AUTHORS INSTALL README
+Copyright: 2010, Ixonos Plc.
+License: other
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.
+
+Files: ./data/*.png ./src/maps/*.png ./src/icons/brain-alone.png ./src/icons/fosdem.png
+Copyright: unknown
+License: unknown
+ The pngs don't have any copyright/license statements, but since
+ they are from the FOSDEM website (and contain 'GIMP' notices) it is assumed
+ that the FOSDEM team is the copyright holder and releases them under a free
+ license.
+
+Files: ./src/icons/add.png ./src/icons/reload.png ./src/icons/remove.png
+Copyright: 2002-2008, Ulisse Perusin <uli.peru@gmail.com>
+ 2002-2008, Riccardo Buzzotta <raozuzu@yahoo.it>
+ 2002-2008, Josef Vybíral <cornelius@vybiral.info>
+ 2002-2008, Hylke Bons <h.bons@student.rug.nl>
+ 2002-2008, Ricardo González <rick@jinlabs.com>
+ 2002-2008, Lapo Calamandrei <calamandrei@gmail.com>
+ 2002-2008, Rodney Dawes <dobey@novell.com>
+ 2002-2008, Luca Ferretti <elle.uca@libero.it>
+ 2002-2008, Tuomas Kuosmanen <tigert@gimp.org>
+ 2002-2008, Andreas Nilsson <nisses.mail@home.se>
+ 2002-2008, Jakub Steiner <jimmac@novell.com>
+License: GPL-2
+Comment: "... are taken from Ubuntu package gnome-icon-theme"
+
+Files: debian/*
+Copyright: 2010-2011, gregor herrmann <gregoa@debian.org>
+License: GPL-2+
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, version 2.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'
diff --git a/debian/fosdem-schedule.docs b/debian/fosdem-schedule.docs
new file mode 100644 (file)
index 0000000..c02a307
--- /dev/null
@@ -0,0 +1,3 @@
+docs/user-stories.txt
+README
+AUTHORS
diff --git a/debian/fosdem-schedule.install b/debian/fosdem-schedule.install
new file mode 100644 (file)
index 0000000..fb007f4
--- /dev/null
@@ -0,0 +1 @@
+debian/fosdem-schedule.xpm usr/share/pixmaps
diff --git a/debian/fosdem-schedule.manpages b/debian/fosdem-schedule.manpages
new file mode 100644 (file)
index 0000000..fc1201c
--- /dev/null
@@ -0,0 +1 @@
+debian/fosdem-schedule.1
diff --git a/debian/fosdem-schedule.menu b/debian/fosdem-schedule.menu
new file mode 100644 (file)
index 0000000..0f8811a
--- /dev/null
@@ -0,0 +1,5 @@
+?package(fosdem-schedule):needs="x11" \
+section="Applications/Data Management" \
+title="FOSDEM Schedule" \
+command="fosdem-schedule" \
+icon="/usr/share/pixmaps/fosdem-schedule.xpm"
diff --git a/debian/fosdem-schedule.pod b/debian/fosdem-schedule.pod
new file mode 100644 (file)
index 0000000..10ee670
--- /dev/null
@@ -0,0 +1,28 @@
+=head1 NAME
+
+fosdem-schedule - FOSDEM schedule application
+
+=head1 SYNOPSIS
+
+B<fosdem-schedule>
+
+=head1 DESCRIPTION
+
+B<fosdem-schedule> makes the FOSDEM conference schedule available offline.
+It displays the conference schedule from various views, supports searches on
+various items (speaker, speech topic, location, etc.) and enables you to
+select favourite events and create your own schedule.
+
+=head1 FILES
+
+F<~/.fosdem/fosdem.sqlite>
+
+F<~/.config/Ixonos/FOSDEM.conf>
+
+=head1 COPYRIGHT AND LICENSE
+
+B<fosdem-schedule> is copyright 2010 by Ixonos Plc. and is released under
+the terms of the GNU General Public License, version 2 or later.
+
+This manpage is copyright 2010 by gregor herrmann <gregoa@debian.org> and is
+released under the same terms.
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100644 (file)
index 0000000..86fe113
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+DIR=$(mktemp -d)
+REPO=https://fosdem-maemo.svn.sourceforge.net/svnroot/fosdem-maemo/trunk
+PKG=fosdem-schedule
+OLDVERSION=$(dpkg-parsechangelog | perl -ne 'print $1 if m|^Version: (.+)\+|')
+NEWVERSION="${OLDVERSION}+svn$(svn info $REPO | awk '/Revision:/ {print $2}')+ds"
+PAT=$(echo $DIR | perl -pe 's|^/||; s|/|\\/|g')
+
+svn export --force $REPO $DIR
+rm -rfv $DIR/debian
+
+
+tar --transform "s/$PAT/$PKG-$NEWVERSION/" -zcf ../$PKG-$NEWVERSION.tar.gz $DIR
+
+# not needed anymore, upstream ships NEWS
+# svn2cl $REPO --output=debian/ChangeLog
+
+rm -rf $DIR
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
new file mode 100644 (file)
index 0000000..ed95ab2
--- /dev/null
@@ -0,0 +1,20 @@
+Description: remove Encoding key and hildon stuff, cleanup
+Forwarded: not needed
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2010-12-23
+
+--- a/data/maemo/fosdem-schedule.desktop
++++ b/data/maemo/fosdem-schedule.desktop
+@@ -1,10 +1,7 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=0.4.1
+ Type=Application
+-Name=FOSDEM'10
+-Exec=/usr/bin/fosdem-schedule
++Name=FOSDEM schedule
++Exec=fosdem-schedule
+ Icon=fosdem
+-X-HildonDesk-ShowInToolbar=true
+-X-Osso-Type=application/x-executable
diff --git a/debian/patches/hildon.patch b/debian/patches/hildon.patch
new file mode 100644 (file)
index 0000000..879b9c5
--- /dev/null
@@ -0,0 +1,51 @@
+Description: remove hildon from paths
+Forwarded: not-needed
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2010-12-23
+
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -12,28 +12,28 @@
+ all:
+ install: 
+-      $(CHK_DIR) $(PREFIX)/applications/hildon/ || $(MKDIR) $(PREFIX)/applications/hildon/ 
+-      $(INSTALL_FILE) ./maemo/$(PKG).desktop $(PREFIX)/applications/hildon/
++      $(CHK_DIR) $(PREFIX)/applications/ || $(MKDIR) $(PREFIX)/applications/
++      $(INSTALL_FILE) ./maemo/$(PKG).desktop $(PREFIX)/applications/
+-      $(CHK_DIR) $(PREFIX)/icons/hicolor/26x26/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/26x26/hildon/ 
+-      $(INSTALL_FILE) ./26x26/$(ICON).png $(PREFIX)/icons/hicolor/26x26/hildon/
++      $(CHK_DIR) $(PREFIX)/icons/hicolor/26x26/ || $(MKDIR) $(PREFIX)/icons/hicolor/26x26/
++      $(INSTALL_FILE) ./26x26/$(ICON).png $(PREFIX)/icons/hicolor/26x26/
+-      $(CHK_DIR) $(PREFIX)/icons/hicolor/48x48/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/48x48/hildon/ 
+-      $(INSTALL_FILE) ./48x48/$(ICON).png $(PREFIX)/icons/hicolor/48x48/hildon/
++      $(CHK_DIR) $(PREFIX)/icons/hicolor/48x48/ || $(MKDIR) $(PREFIX)/icons/hicolor/48x48/
++      $(INSTALL_FILE) ./48x48/$(ICON).png $(PREFIX)/icons/hicolor/48x48/
+-      $(CHK_DIR) $(PREFIX)/icons/hicolor/40x40/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/40x40/hildon/ 
+-      $(INSTALL_FILE) ./40x40/$(ICON).png $(PREFIX)/icons/hicolor/40x40/hildon/
++      $(CHK_DIR) $(PREFIX)/icons/hicolor/40x40/ || $(MKDIR) $(PREFIX)/icons/hicolor/40x40/
++      $(INSTALL_FILE) ./40x40/$(ICON).png $(PREFIX)/icons/hicolor/40x40/
+-      $(CHK_DIR) $(PREFIX)/icons/hicolor/64x64/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/64x64/hildon/
+-      $(INSTALL_FILE) ./64x64/$(ICON).png $(PREFIX)/icons/hicolor/64x64/hildon/
++      $(CHK_DIR) $(PREFIX)/icons/hicolor/64x64/ || $(MKDIR) $(PREFIX)/icons/hicolor/64x64/
++      $(INSTALL_FILE) ./64x64/$(ICON).png $(PREFIX)/icons/hicolor/64x64/
+ uninstall:
+-      $(RM) $(PREFIX)/applications/hildon/$(PKG).desktop
+-      $(RM) $(PREFIX)/icons/hicolor/26x26/hildon/$(ICON).png
+-      $(RM) $(PREFIX)/icons/hicolor/40x40/hildon/$(ICON).png
+-      $(RM) $(PREFIX)/icons/hicolor/48x48/hildon/$(ICON).png
+-      $(RM) $(PREFIX)/icons/hicolor/64x64/hildon/$(ICON).png
++      $(RM) $(PREFIX)/applications/$(PKG).desktop
++      $(RM) $(PREFIX)/icons/hicolor/26x26/$(ICON).png
++      $(RM) $(PREFIX)/icons/hicolor/40x40/$(ICON).png
++      $(RM) $(PREFIX)/icons/hicolor/48x48/$(ICON).png
++      $(RM) $(PREFIX)/icons/hicolor/64x64/$(ICON).png
+ clean:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..6554b84
--- /dev/null
@@ -0,0 +1,2 @@
+desktop.patch
+hildon.patch
diff --git a/debian/repack.local b/debian/repack.local
new file mode 100644 (file)
index 0000000..3bcaf02
--- /dev/null
@@ -0,0 +1,2 @@
+SUFFIX=+ds
+rm debian
diff --git a/debian/repack.stub b/debian/repack.stub
new file mode 100644 (file)
index 0000000..ac56520
--- /dev/null
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+: <<=cut
+=pod
+
+=head1 NAME
+
+repack.stub - script to repack upstream tarballs from uscan
+
+=head1 INSTRUCTIONS
+
+put this in debian/repack.stub and add "debian sh debian/repack.stub" to
+the end of the line in debian/watch. you will also need to add a version
+mangle to debian/watch.
+
+then create a debian/repack.local. this is a shell script that is
+sources under "set -e", so be careful to check returns codes.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item rm
+
+rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item mv
+
+mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item requires_version
+
+requires_version is there for future usage for requiring certain versions of the script
+
+=back
+
+=head1 VARIABLES
+
+=over 4
+
+=item SUFFIX
+
+defaults to +dfsg
+
+what to append to the upstream version
+
+=item RM_OPTS
+
+defaults to -vrf
+
+options to pass to rm
+
+=item MANIFEST
+
+defaults to 0, set to 1 to turn on.
+
+this will manipulate MANIFEST files in CPAN tarballs.
+
+=item UP_BASE
+
+this is the directory where the upstream source is.
+
+=back
+
+=cut
+
+if [ -z "$REPACK_SH" ]; then
+    if [ -f ../../scripts/repack.sh ]; then
+        REPACK_SH=../../scripts/repack.sh
+    fi
+    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
+        REPACK_SH=$(which repack.sh)
+    fi
+fi
+
+if [ ! -f "$REPACK_SH" ]; then
+    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
+    echo "You can get it from http://svn.debian.org/viewsvn/pkg-perl/scripts/repack.sh"
+    exit 1
+fi
+
+exec "$REPACK_SH" "$@"
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..f505157
--- /dev/null
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+SQLITE  = $(shell dpkg-query --show --showformat='$${Version}\n' libqt4-sql-sqlite | sed -e 's/-[^-]\+$$//')
+
+%:
+       dh $@
+
+override_dh_auto_build:
+       dh_auto_build
+       pod2man debian/$(PACKAGE).pod > debian/$(PACKAGE).1
+       convert -geometry 32x32 ./data/64x64/fosdem.png debian/fosdem-schedule.xpm
+
+override_dh_auto_test:
+       # broken in data, does nothing in src
+
+override_dh_installchangelogs:
+       dh_installchangelogs NEWS
+
+override_dh_gencontrol:
+       dh_gencontrol -- \
+       -Vsqlite:Depends="$(SQLITE)"
+
+get-orig-source:
+       # for svn snapshots, otherwise uscan works
+       sh debian/get-orig-source
+
+.PHONY: get-orig-source
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..ed41c40
--- /dev/null
@@ -0,0 +1,2 @@
+# good idea, doesn't work right now
+fosdem-schedule source: debian-watch-file-should-use-sf-redirector
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..339b71e
--- /dev/null
@@ -0,0 +1,9 @@
+version=3
+
+#opts=dversionmangle=s/\+ds// \
+#http://sf.net/fosdem-maemo/fosdem-schedule-(.+)\.tar\.gz \
+#      debian sh debian/repack.stub
+
+opts=dversionmangle=s/\+ds// \
+http://sourceforge.net/projects/fosdem-maemo/files/ .*/fosdem-schedule-(.+).tar.gz.* \
+       debian sh debian/repack.stub