change +ds suffix to +dfsg. we are repacking for license issues now.

diff --git a/debian/changelog b/debian/changelog
index 6354907..4fcd9ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jabref (2.6~beta2+ds-1) UNRELEASED; urgency=low
+jabref (2.6~beta2+dfsg-1) UNRELEASED; urgency=low
 
   TODO:
   - debian/copyright: OMG. some non-free

diff --git a/debian/copyright b/debian/copyright
index 5ab4063..845f1f5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,9 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&
 Maintainer: Morten Alver, Nizar Batada
 Source: http://jabref.sourceforge.net/
 Name: JabRef
-Disclaimer: The +ds version is created by removing the lib/ directory from the
- upstream tarball which contains sourceless pre-compiled libraries.
+Disclaimer: The +dfsg version is created by removing 
+ - lib/: contains sourceless pre-compiled libraries
+ - src/java/net/sf/jabref/util/DocumentPrinter.java: no license
 
 Files: *
 Copyright: 2009, Morten Alver <mortenalver@users.sourceforge.net>

diff --git a/debian/repack.local b/debian/repack.local
index c9281ba..ac6b48d 100644 (file)
--- a/debian/repack.local
+++ b/debian/repack.local
@@ -1,4 +1,3 @@
-SUFFIX=+ds
 requires_version 2
 rm lib
 rm src/java/net/sf/jabref/util/DocumentPrinter.java

diff --git a/debian/watch b/debian/watch
index 683e605..7bb8118 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="dversionmangle=s/\+ds$//;,uversionmangle=s/(\D)$/${1}1/;s/b(?:eta)?(\d)?$/~beta${1}/" \
+opts="dversionmangle=s/\+dfsg$//;,uversionmangle=s/(\D)$/${1}1/;s/b(?:eta)?(\d)?$/~beta${1}/" \
        http://sf.net/jabref/JabRef-(.+)-src\.tar\.bz2 \
        debian sh debian/repack.stub