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
-
-
-
-
-
-
reverted:
--- zim-0.20/debian/compat
+++ zim-0.20.orig/debian/compat
@@ -1 +0,0 @@
-5
reverted:
--- zim-0.20/debian/copyright
+++ zim-0.20.orig/debian/copyright
@@ -1,16 +0,0 @@
-This package was debianized by Florian Ragwitz on
-Wed, 26 Oct 2005 16:57:34 +0200.
-
-It was downloaded from http://zoidberg.student.utwente.nl/zim/index.shtml
-
-Copyright Holder: Copyright (c) 2005 Jaap G Karssenberg
-
-License:
-
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License. On Debian GNU/Linux systems, the complete text of the
-GNU General Public License can be found in `/usr/share/common-licenses/GPL'
-and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
reverted:
--- zim-0.20/debian/menu
+++ zim-0.20.orig/debian/menu
@@ -1,2 +0,0 @@
-?package(zim):needs="x11" section="Apps/Tools" \
- title="zim" command="/usr/bin/zim"
reverted:
--- zim-0.20/debian/watch
+++ zim-0.20.orig/debian/watch
@@ -1,2 +0,0 @@
-version=3
-http://zoidberg.student.utwente.nl/downloads/Zim/Zim-(.*)\.tar.* debian uupdate
reverted:
--- zim-0.20/debian/control
+++ zim-0.20.orig/debian/control
@@ -1,19 +0,0 @@
-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)
-Standards-Version: 3.7.2
-
-Package: zim
-Architecture: all
-Depends: ${perl:Depends}, libfile-basedir-perl, libfile-mimeinfo-perl, libgtk2-perl
-Recommends: libgtk2-trayicon-perl, libgtk2-spell-perl
-Suggests: desktop-file-utils
-Description: a desktop wiki
- Zim is a WYSIWYG text editor. It aims at bringing the concept of a wiki to
- your desktop. For example every page is saved as a text file with wiki markup.
- Pages can contain links to other pages, and are saved automatically. Creating
- a new page is as easy as linking to a non-existing page. This tool is intended
- to keep track of TODO lists or serve as a personal scratch book.
reverted:
--- zim-0.20/debian/rules
+++ zim-0.20.orig/debian/rules
@@ -1,57 +0,0 @@
-#!/usr/bin/make -f
-
-export PERL_MM_USE_DEFAULT=1
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Build.PL installdirs=vendor
- OPTIMIZE="-Wall -O2 -g" $(PERL) Build
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Build ] || $(PERL) Build distclean
- dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
- $(PERL) Build test
- $(PERL) Build install destdir=$(TMP)
- touch install-stamp
-
-binary-arch:
-# We have nothing to do by default.
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_installmenu
- dh_desktop
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
reverted:
--- zim-0.20/debian/changelog
+++ zim-0.20.orig/debian/changelog
@@ -1,124 +0,0 @@
-zim (0.20-1) unstable; urgency=low
-
- * New upstream release
- * Fix the bug which cause wrong internal links (Closes: #438612)
-
- -- Emfox Zhou Sat, 25 Aug 2007 13:04:42 +0800
-
-zim (0.19-1) unstable; urgency=low
-
- * New upstream release
- - fix an annoying bug that history is initialized properly.
-
- -- Emfox Zhou Thu, 22 Mar 2007 19:06:38 +0800
-
-zim (0.18-1) unstable; urgency=low
-
- * Change Maintainer's Address.
- * New upstream release
- - UTF-8 page name issues fixed.
- - Fine-tuned auto-linking behavior. (Closes: #406091)
- - Various bug fixes and enhancement.
- * Suggest desktop-file-utils (Closes: #402212)
-
- -- Emfox Zhou Sun, 18 Mar 2007 07:20:18 +0800
-
-zim (0.17-1) unstable; urgency=low
-
- * New upstream release
-
- -- Emfox Zhou Fri, 10 Nov 2006 14:39:03 +0000
-
-zim (0.16-1) unstable; urgency=low
-
- * New upstream release (Closes: #381681)
- - Many improvments.
- - Removed 'Delete' accelerator (Closes: #351539)
- - Other bug fixes (Closes: #366503, #375326)
-
- -- Emfox Zhou Fri, 1 Sep 2006 06:55:24 +0800
-
-zim (0.15-1) unstable; urgency=low
-
- * New upstream release
- * debian/NEWS: spell fixes.
- * debhelper should be build-deps instead of build-deps-indep.
- * Update to Policy 3.7.2, no changes.
-
- -- Emfox Zhou Fri, 16 Jun 2006 10:29:37 +0800
-
-zim (0.14-1) unstable; urgency=low
-
- * New upstream release
- - Revert to use png icon instead of svg one. (Closes: #358125)
- - Fix crash when started with an empty dir. (Closes: #354210)
- * loosen dependency of libgtk2-trayicon-perl and libgtk2-spell-perl. (Closes: #357677)
-
- -- Emfox Zhou Fri, 31 Mar 2006 20:51:19 +0800
-
-zim (0.13-1) unstable; urgency=low
-
- [ Emfox Zhou ]
- * New upstream release
-
- [ Florian Ragwitz ]
- * Updated my mail address in the Uploaders field.
- * Removed unneeded dh_link call from debian/rules.
- * Added libtest-pod-perl and libtest-pod-coverage-perl to
- Build-Depends-Indep to enable Pod testing at build time.
-
- -- Florian Ragwitz Thu, 16 Mar 2006 15:54:51 +0100
-
-zim (0.12-1) unstable; urgency=low
-
- * New upstream release
- * Add missing dependencies. Only build-deps added in previous version.
- * Depend on debhelper 5.0 as compat level does.
- * Change menu action way, add NEWS to mention this.
-
- -- Emfox Zhou Wed, 15 Feb 2006 09:24:17 +0800
-
-zim (0.11-1) unstable; urgency=low
-
- * New upstream release
- * add dependency of libgtk2-trayicon-perl and libgtk2-spell-perl.
-
- -- Emfox Zhou Sat, 21 Jan 2006 00:20:27 +0800
-
-zim (0.09-1) unstable; urgency=low
-
- * New upstream release
- * Bump compatibility level of debhelper.
- * Add Debian watch file.
-
- -- Emfox Zhou Tue, 3 Jan 2006 00:51:03 +0800
-
-zim (0.08-1) unstable; urgency=low
-
- * New upstream release (Closes: #343198)
- * Includes a TrayIcon component (Closes: #337824).
- * Includes support for rich copy/paste (Closes: #338050).
- * Some other bug fixes and enhancement.
-
- -- Emfox Zhou Thu, 1 Dec 2005 11:38:02 +0800
-
-zim (0.07-1) unstable; urgency=low
-
- * New upstream release
- * Replace .desktop file with the one from upstream.
-
- -- Emfox Zhou Mon, 7 Nov 2005 00:15:45 +0800
-
-zim (0.06-2) unstable; urgency=low
-
- * Add missing build dependency.
- * Add the menu and .desktop files (Closes: #337420).
-
- -- Emfox Zhou Fri, 4 Nov 2005 20:26:40 +0800
-
-zim (0.06-1) unstable; urgency=low
-
- * Initial release (Closes: #334891).
-
- -- Florian Ragwitz Wed, 26 Oct 2005 16:57:34 +0200
-
reverted:
--- zim-0.20/debian/NEWS
+++ zim-0.20.orig/debian/NEWS
@@ -1,10 +0,0 @@
-zim (0.12-1) unstable; urgency=low
-
- Since new zim started to use ~/zim_pages as its default location, and no
- need to manually specify a directory, I changed the command line of the
- menu file back to the default. Everyone used to start zim from the menu
- file, if you suffer from a data loss, should do as follows:
-
- mv ~/zim_pages ~/zim_pages.bak; mv ~/.zim ~/zim_pages
-
- -- Emfox Zhou Wed, 15 Feb 2006 09:24:17 +0800
only in patch2:
unchanged:
--- zim-0.23.orig/debian/watch
+++ zim-0.23/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://zoidberg.student.utwente.nl/downloads/Zim/Zim-(.*)\.tar.* debian uupdate
only in patch2:
unchanged:
--- zim-0.23.orig/debian/compat
+++ zim-0.23/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- zim-0.23.orig/debian/control
+++ zim-0.23/debian/control
@@ -0,0 +1,23 @@
+Source: zim
+Section: x11
+Priority: optional
+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 (>= 0.03), libfile-mimeinfo-perl, libgtk2-perl
+Recommends: libgtk2-trayicon-perl, libgtk2-spell-perl
+Suggests: desktop-file-utils
+Description: a desktop wiki
+ Zim is a WYSIWYG text editor. It aims at bringing the concept of a wiki to
+ your desktop. For example every page is saved as a text file with wiki markup.
+ Pages can contain links to other pages, and are saved automatically. Creating
+ a new page is as easy as linking to a non-existing page. This tool is intended
+ to keep track of TODO lists or serve as a personal scratch book.
+ .
+ http://pardus-larus.student.utwente.nl/%7Epardus/projects/zim/
only in patch2:
unchanged:
--- zim-0.23.orig/debian/changelog
+++ zim-0.23/debian/changelog
@@ -0,0 +1,149 @@
+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
+ * Fix the bug which cause wrong internal links (Closes: #438612)
+
+ -- Emfox Zhou Sat, 25 Aug 2007 13:04:42 +0800
+
+zim (0.19-1) unstable; urgency=low
+
+ * New upstream release
+ - fix an annoying bug that history is initialized properly.
+
+ -- Emfox Zhou Thu, 22 Mar 2007 19:06:38 +0800
+
+zim (0.18-1) unstable; urgency=low
+
+ * Change Maintainer's Address.
+ * New upstream release
+ - UTF-8 page name issues fixed.
+ - Fine-tuned auto-linking behavior. (Closes: #406091)
+ - Various bug fixes and enhancement.
+ * Suggest desktop-file-utils (Closes: #402212)
+
+ -- Emfox Zhou Sun, 18 Mar 2007 07:20:18 +0800
+
+zim (0.17-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Emfox Zhou Fri, 10 Nov 2006 14:39:03 +0000
+
+zim (0.16-1) unstable; urgency=low
+
+ * New upstream release (Closes: #381681)
+ - Many improvments.
+ - Removed 'Delete' accelerator (Closes: #351539)
+ - Other bug fixes (Closes: #366503, #375326)
+
+ -- Emfox Zhou Fri, 1 Sep 2006 06:55:24 +0800
+
+zim (0.15-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/NEWS: spell fixes.
+ * debhelper should be build-deps instead of build-deps-indep.
+ * Update to Policy 3.7.2, no changes.
+
+ -- Emfox Zhou Fri, 16 Jun 2006 10:29:37 +0800
+
+zim (0.14-1) unstable; urgency=low
+
+ * New upstream release
+ - Revert to use png icon instead of svg one. (Closes: #358125)
+ - Fix crash when started with an empty dir. (Closes: #354210)
+ * loosen dependency of libgtk2-trayicon-perl and libgtk2-spell-perl. (Closes: #357677)
+
+ -- Emfox Zhou Fri, 31 Mar 2006 20:51:19 +0800
+
+zim (0.13-1) unstable; urgency=low
+
+ [ Emfox Zhou ]
+ * New upstream release
+
+ [ Florian Ragwitz ]
+ * Updated my mail address in the Uploaders field.
+ * Removed unneeded dh_link call from debian/rules.
+ * Added libtest-pod-perl and libtest-pod-coverage-perl to
+ Build-Depends-Indep to enable Pod testing at build time.
+
+ -- Florian Ragwitz Thu, 16 Mar 2006 15:54:51 +0100
+
+zim (0.12-1) unstable; urgency=low
+
+ * New upstream release
+ * Add missing dependencies. Only build-deps added in previous version.
+ * Depend on debhelper 5.0 as compat level does.
+ * Change menu action way, add NEWS to mention this.
+
+ -- Emfox Zhou Wed, 15 Feb 2006 09:24:17 +0800
+
+zim (0.11-1) unstable; urgency=low
+
+ * New upstream release
+ * add dependency of libgtk2-trayicon-perl and libgtk2-spell-perl.
+
+ -- Emfox Zhou Sat, 21 Jan 2006 00:20:27 +0800
+
+zim (0.09-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump compatibility level of debhelper.
+ * Add Debian watch file.
+
+ -- Emfox Zhou Tue, 3 Jan 2006 00:51:03 +0800
+
+zim (0.08-1) unstable; urgency=low
+
+ * New upstream release (Closes: #343198)
+ * Includes a TrayIcon component (Closes: #337824).
+ * Includes support for rich copy/paste (Closes: #338050).
+ * Some other bug fixes and enhancement.
+
+ -- Emfox Zhou Thu, 1 Dec 2005 11:38:02 +0800
+
+zim (0.07-1) unstable; urgency=low
+
+ * New upstream release
+ * Replace .desktop file with the one from upstream.
+
+ -- Emfox Zhou Mon, 7 Nov 2005 00:15:45 +0800
+
+zim (0.06-2) unstable; urgency=low
+
+ * Add missing build dependency.
+ * Add the menu and .desktop files (Closes: #337420).
+
+ -- Emfox Zhou Fri, 4 Nov 2005 20:26:40 +0800
+
+zim (0.06-1) unstable; urgency=low
+
+ * Initial release (Closes: #334891).
+
+ -- Florian Ragwitz Wed, 26 Oct 2005 16:57:34 +0200
+
only in patch2:
unchanged:
--- zim-0.23.orig/debian/menu
+++ zim-0.23/debian/menu
@@ -0,0 +1,2 @@
+?package(zim):needs="x11" section="Applications/Text" \
+ title="zim" command="/usr/bin/zim"
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
only in patch2:
unchanged:
--- zim-0.23.orig/debian/copyright
+++ zim-0.23/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Florian Ragwitz on
+Wed, 26 Oct 2005 16:57:34 +0200.
+
+It was downloaded from http://zoidberg.student.utwente.nl/zim/index.shtml
+
+Copyright Holder: Copyright (c) 2005 Jaap G Karssenberg
+
+License:
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+Perl is distributed under your choice of the GNU General Public License or
+the Artistic License. On Debian GNU/Linux systems, the complete text of the
+GNU General Public License can be found in `/usr/share/common-licenses/GPL'
+and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
only in patch2:
unchanged:
--- zim-0.23.orig/debian/rules
+++ zim-0.23/debian/rules
@@ -0,0 +1,62 @@
+#!/usr/bin/make -f
+
+export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/dpatch/dpatch.make
+
+PACKAGE=$(shell dh_listpackages)
+
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
+TMP =$(CURDIR)/debian/$(PACKAGE)
+
+build: patch build-stamp
+build-stamp:
+ dh_testdir
+ $(PERL) Build.PL installdirs=vendor
+ OPTIMIZE="-Wall -O2 -g" $(PERL) Build
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ [ ! -f Build ] || $(PERL) Build distclean
+ dh_clean build-stamp install-stamp
+
+install: build install-stamp
+install-stamp:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ $(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.
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs Changes
+ dh_installmenu
+ dh_desktop
+ dh_perl
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
only in patch2:
unchanged:
--- zim-0.23.orig/debian/NEWS
+++ zim-0.23/debian/NEWS
@@ -0,0 +1,10 @@
+zim (0.12-1) unstable; urgency=low
+
+ Since new zim started to use ~/zim_pages as its default location, and no
+ need to manually specify a directory, I changed the command line of the
+ menu file back to the default. Everyone used to start zim from the menu
+ file, if you suffer from a data loss, should do as follows:
+
+ mv ~/zim_pages ~/zim_pages.bak; mv ~/.zim ~/zim_pages
+
+ -- Emfox Zhou Wed, 15 Feb 2006 09:24:17 +0800