reverted:
--- zim-0.20/t/repository/Test/wiki.txt
+++ zim-0.20.orig/t/repository/Test/wiki.txt
@@ -1,80 +0,0 @@
-====== Foo Bar ======
-
-This is a **test page** to see how parsing goes
-when ''we'' ''loop'',
-arbitrary //content// through our __parser__
-
-($ROOT, $PAGE, @BACK, @FORW, $UNDO, $REDO);
- my (%tree_iter, $tree_loaded, $pane_visible);
- my (@undo_chars, $undo_lock, $save_lock, $overwrite_toggle);
- my %undo_steps = (
- delete => 'insert', insert => 'delete',
- apply_tag => 'remove_tag', remove_tag => 'apply_tag' );
- my $link_icon = Gtk2->CHECK_VERSION(2, 6, 0) ? 'gtk-connect' : 'gtk-convert';
- # gtk-connect stock item was introduced in 2.6.0
- my $DATA_DIR = find_data_dir();
- my $ICON_FILE = File::Spec->catfile($DATA_DIR, qw/images zim64.png/);
-
-my %opts = ( 'read_only' => 0 );
- for (@ARGV) {
- next unless /^-/;
- if (/^(--version|-v)$/) {
- print version();
- exit;
- }
- elsif (/^--read-?o
- my $iter = $buffer->get_iter_at_mark($buffer->get_insert());
- return parse_backspace($iter);
- }
- elsif ($val == $k_tab or $val == ord(' ')) { # Other WhiteSpace
- my $buffer = $self->get_buffer;
- my $iter = $buffer->get_iter_at_mark($buffer->get_insert());
- my $string = ($val == $k_tab) ? "\t" : ' ';
- return parse_word($iter, $string);
- }
- #else { printf "key %x pressed\n", $val } # perldoc -m Gtk2::Gdk::Keysyms
-
-return 0; } )
-unless $opts{read_only};
-
-Glib::Timeout->add(5000, \&save_page)
- unless $opts{read_only}; # TODO also use this timer for maintaining an undo stack
-
- # ################# #
-
-
- some pre format
- dsfdf
- dfssdf
- sdfsdf
-
- sdf
- sdf
- *&^*&%*&
-
-===== So =====
-what do we need to type
-* to make
- * the parser
- * vomit
- * ???
-
-OK, maybe a heading
-==== Hmmm ====
-sandwhich might do that ?
-
-dfsfds
-sdfd
-fdsfdsfdsfds
-
-
-{{foo.png}}{{bar.png}}
-
-
-fsdfds
-
-=== fdsfds ===
-
-123 test
-
-sdffdsfds
reverted:
--- zim-0.20/t/repository/Test/foo/bar.txt
+++ zim-0.20.orig/t/repository/Test/foo/bar.txt
@@ -1,6 +0,0 @@
-= FOO =
-
-[[wIKi]]
-
-•• Search Me ••
-
reverted:
--- zim-0.20/t/repository/Test/foo.txt
+++ zim-0.20.orig/t/repository/Test/foo.txt
@@ -1,4 +0,0 @@
-====== Foo ======
-
-bar baz
-
reverted:
--- zim-0.20/t/repository/Test/bar.txt
+++ zim-0.20.orig/t/repository/Test/bar.txt
@@ -1,3 +0,0 @@
-=== Bar ===
-
-foo bar !
reverted:
--- zim-0.20/t/repository/.zim.cache
+++ zim-0.20.orig/t/repository/.zim.cache
@@ -1,9 +0,0 @@
-zim: version 0.18
-: 1174561783 /
-:Test: 0 >
-:Test:foo: 1174561777 /
-:Test:foo:bar 1174561777 > :Test:wiki
-:Test: 1174561784 /
-:Test:bar 1174561783 >
-:Test:foo: 1174561777 >
-:Test:wiki 1174561777 >
reverted:
--- zim-0.20/t/test_hist.cache
+++ zim-0.20.orig/t/test_hist.cache
@@ -1,16 +0,0 @@
-zim: version 0.19
-point: 4
-hist: 7
-:foo:bar 42
-:foo 42
-:foo:baz 42
-:foo:bar 42
-:foo:bar:dus 42
-:test 42
-:foo:test 42
-:foo 42
-:foo:baz 42
-:foo:bar 42
-:foo:bar:dus 42
-:test 42
-:foo:test 42
reverted:
--- zim-0.20/t/html/index.html
+++ zim-0.20.orig/t/html/index.html
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- [ Prev ]
-
- [ Index ]
-
- [ Next ]
-
-
-
-
-
-
-
-Document index
-
-
-
-
-
-
-
-
-
-
-
-
-
- No backlinks to this page.
-
-
-
-
-
-
reverted:
--- zim-0.20/t/html/.zim.cache
+++ zim-0.20.orig/t/html/.zim.cache
@@ -1,6 +0,0 @@
-zim: version 0.18
-:Test:bar 1174561785 >
-:Test:foo 1174561785 >
-:Test:foo:bar 1174561785 > :Test:wiki
-:Test:wiki 1174561785 >
-:index 1174561785 > :Test:foo:bar :Test:foo :Test:wiki :Test:bar
reverted:
--- zim-0.20/t/html/Test/bar.html
+++ zim-0.20.orig/t/html/Test/bar.html
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- [ Prev ]
-
- [ Index ]
-
- [ Next ]
-
-
-
-
-
-
-
-Bar
-
-
-foo bar !
-
-
-
-
-
-
-
-
-
-
- No backlinks to this page.
-
-
-
-
-
-
reverted:
--- zim-0.20/t/html/Test/foo.html
+++ zim-0.20.orig/t/html/Test/foo.html
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- [ Prev ]
-
- [ Index ]
-
- [ Next ]
-
-
-
-
-
-
-
-Foo
-
-
-bar baz
-
-
-
-
-
-
-
-
-
-
- No backlinks to this page.
-
-
-
-
-
-
reverted:
--- zim-0.20/t/html/Test/foo/bar.html
+++ zim-0.20.orig/t/html/Test/foo/bar.html
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- [ Prev ]
-
- [ Index ]
-
- [ Next ]
-
-
-
-
-
-
-
-
-
-
-= FOO =
-
-
-
-wIKi
-
-
-
-•• Search Me ••
-
-
-
-
-
-
-
-
-
-
- No backlinks to this page.
-
-
-
-
-
-
reverted:
--- zim-0.20/t/html/Test/wiki.html
+++ zim-0.20.orig/t/html/Test/wiki.html
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- [ Prev ]
-
- [ Index ]
-
- [ Next ]
-
-
-
-
-
-
-
-Foo Bar
-
-
-This is a test page to see how parsing goes
-when we loop,
-arbitrary content through our parser
-
-
-
-($ROOT, $PAGE, @BACK, @FORW, $UNDO, $REDO);
- my (%tree_iter, $tree_loaded, $pane_visible);
- my (@undo_chars, $undo_lock, $save_lock, $overwrite_toggle);
- my %undo_steps = (
- delete => 'insert', insert => 'delete',
- apply_tag => 'remove_tag', remove_tag => 'apply_tag' );
- my $link_icon = Gtk2->CHECK_VERSION(2, 6, 0) ? 'gtk-connect' : 'gtk-convert';
- # gtk-connect stock item was introduced in 2.6.0
- my $DATA_DIR = find_data_dir();
- my $ICON_FILE = File::Spec->catfile($DATA_DIR, qw/images zim64.png/);
-
-
-
-my %opts = ( 'read_only' => 0 );
- for (@ARGV) {
- next unless /^-/;
- if (/^(--version|-v)$/) {
- print version();
- exit;
- }
- elsif (/^--read-?o
- my $iter = $buffer->get_iter_at_mark($buffer->get_insert());
- return parse_backspace($iter);
- }
- elsif ($val == $k_tab or $val == ord(' ')) { # Other WhiteSpace
- my $buffer = $self->get_buffer;
- my $iter = $buffer->get_iter_at_mark($buffer->get_insert());
- my $string = ($val == $k_tab) ? "\t" : ' ';
- return parse_word($iter, $string);
- }
- #else { printf "key %x pressed\n", $val } # perldoc -m Gtk2::Gdk::Keysyms
-
-
-
-return 0; } )
-unless $opts{read_only};
-
-
-
-Glib::Timeout->add(5000, \'save_page)
- unless $opts{read_only}; # TODO also use this timer for maintaining an undo stack
-
-
-
-# ################# #
-
-
-some pre format
-dsfdf
- dfssdf
- sdfsdf
-
-
-sdf
-sdf
- *'^*'%*'
-
-So
-what do we need to type
-
-
-
-
-OK, maybe a heading
-
-
-Hmmm
-
-sandwhich might do that ?
-
-
-
-dfsfds
-sdfd
-fdsfdsfdsfds
-
-
-
-
-
-
-
-fsdfds
-
-
-fdsfds
-
-123 test
-
-
-
-sdffdsfds
-
-
-
-
-
-
-
-
-
-
- Backlinks:
- :Test:foo:bar
-
-
-
-
-
-
diff -u zim-0.20/debian/menu zim-0.23/debian/menu
--- zim-0.20/debian/menu
+++ zim-0.23/debian/menu
@@ -1,2 +1,2 @@
-?package(zim):needs="x11" section="Apps/Tools" \
+?package(zim):needs="x11" section="Applications/Text" \
title="zim" command="/usr/bin/zim"
diff -u zim-0.20/debian/control zim-0.23/debian/control
--- zim-0.20/debian/control
+++ zim-0.23/debian/control
@@ -1,14 +1,16 @@
Source: zim
Section: x11
Priority: optional
-Maintainer: Emfox Zhou
-Build-Depends-Indep: perl, libmodule-build-perl, libfile-basedir-perl, libfile-mimeinfo-perl, libgtk2-perl, libgtk2-trayicon-perl, libgtk2-spell-perl, libtest-pod-perl, libtest-pod-coverage-perl
-Build-Depends: debhelper (>=5.0)
+Maintainer: Cody A.W. Somerville
+XSBC-Original-Maintainer: Emfox Zhou
+Build-Depends-Indep: perl, libfile-basedir-perl (>= 0.03), libfile-mimeinfo-perl, libgtk2-perl, libgtk2-trayicon-perl, libgtk2-spell-perl, libtest-pod-perl, libtest-pod-coverage-perl
+Build-Depends: debhelper (>=5.0), libmodule-build-perl, dpatch
Standards-Version: 3.7.2
+Homepage: http://pardus-larus.student.utwente.nl/%7Epardus/projects/zim/
Package: zim
Architecture: all
-Depends: ${perl:Depends}, libfile-basedir-perl, libfile-mimeinfo-perl, libgtk2-perl
+Depends: ${perl:Depends}, libfile-basedir-perl (>= 0.03), libfile-mimeinfo-perl, libgtk2-perl
Recommends: libgtk2-trayicon-perl, libgtk2-spell-perl
Suggests: desktop-file-utils
Description: a desktop wiki
@@ -19,0 +22,2 @@
+ .
+ http://pardus-larus.student.utwente.nl/%7Epardus/projects/zim/
diff -u zim-0.20/debian/rules zim-0.23/debian/rules
--- zim-0.20/debian/rules
+++ zim-0.23/debian/rules
@@ -2,6 +2,8 @@
export PERL_MM_USE_DEFAULT=1
+include /usr/share/dpatch/dpatch.make
+
PACKAGE=$(shell dh_listpackages)
ifndef PERL
@@ -10,14 +12,14 @@
TMP =$(CURDIR)/debian/$(PACKAGE)
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
$(PERL) Build.PL installdirs=vendor
OPTIMIZE="-Wall -O2 -g" $(PERL) Build
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
[ ! -f Build ] || $(PERL) Build distclean
@@ -31,6 +33,9 @@
$(PERL) Build test
$(PERL) Build install destdir=$(TMP)
touch install-stamp
+ # Fix permissions
+ chmod -x debian/zim/usr/share/zim/dates.list
+ chmod -x debian/zim/usr/share/zim/plugins/Subversion.pl
binary-arch:
# We have nothing to do by default.
diff -u zim-0.20/debian/changelog zim-0.23/debian/changelog
--- zim-0.20/debian/changelog
+++ zim-0.23/debian/changelog
@@ -1,3 +1,28 @@
+zim (0.23-0ubuntu1) hardy; urgency=low
+
+ * New upstream release. ( lp: #165285 )
+ * debian/control:
+ - Updated maintainer fields
+ - Added homepage field
+ - Added url to description
+ - Moved libmodule-build-perl from build-deps-indep to build-dep
+ - Added build-depend dpatch
+ - Updated libfile-basedir-perl build-deps-indep & depends: >= 0.03
+ * debian/rules:
+ - Updated to use dpatch
+ - install:
+ . Remove executable permission for usr/share/zim/dates.list
+ . Remove executable permission for usr/share/zim/plugins/Subversion.pl
+ * New patches:
+ - 10fix-desktopfile.dpatch: Fix desktop file
+ - 20Disable-changelog_install.dpatch: Disable installing changelog
+ * debian/menu: Updated to meet debian menu policy
+ * Closes the following lp bugs:
+ - LP: #134780
+ - LP: #165258
+
+ -- Cody A.W. Somerville Tue, 27 Nov 2007 01:26:43 -0400
+
zim (0.20-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- zim-0.23.orig/debian/patches/20Disable-changelog_install.dpatch
+++ zim-0.23/debian/patches/20Disable-changelog_install.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20Disable-changelog_install.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable installing of changelog (We do that).
+
+@DPATCH@
+diff -urNad zim-0.23~/Build.PL zim-0.23/Build.PL
+--- zim-0.23~/Build.PL 2007-11-21 06:21:23.000000000 -0800
++++ zim-0.23/Build.PL 2007-11-27 20:25:37.000000000 -0800
+@@ -61,10 +61,10 @@
+ from => $_,
+ to => File::Spec->catfile($blib, $to) );
+ }
+- $self->copy_if_modified(
+- from => 'Changes',
+- to => File::Spec->catfile($blib,
+- qw/share zim doc Zim changelog.txt/ ) );
++# $self->copy_if_modified(
++# from => 'Changes',
++# to => File::Spec->catfile($blib,
++# qw/share zim doc Zim changelog.txt/ ) );
+ }
+
+ sub install_types { # Why O Why is this necessary ?
only in patch2:
unchanged:
--- zim-0.23.orig/debian/patches/10fix-desktopfile.dpatch
+++ zim-0.23/debian/patches/10fix-desktopfile.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10fix-desktopfile.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updated desktopfile to conform to OD standards.
+
+@DPATCH@
+diff -urNad zim-0.23~/share/applications/zim.desktop zim-0.23/share/applications/zim.desktop
+--- zim-0.23~/share/applications/zim.desktop 2007-11-21 06:21:23.000000000 -0800
++++ zim-0.23/share/applications/zim.desktop 2007-11-27 19:25:58.000000000 -0800
+@@ -6,7 +6,7 @@
+ Icon=zim
+ StartupNotify=true
+ Terminal=false
+-Categories=GTK;Application;Utility;TextEditor;
++Categories=Utility;TextTools;GTK
+ MimeType=inode/directory
+ Name=Zim Desktop Wiki
+ Name[nl]=Zim Desktop Wiki
only in patch2:
unchanged:
--- zim-0.23.orig/debian/patches/00list
+++ zim-0.23/debian/patches/00list
@@ -0,0 +1,2 @@
+10fix-desktopfile.dpatch
+20Disable-changelog_install.dpatch