change version suffix to +ds since we are not repackaging for license

issues anymore

diff --git a/debian/changelog b/debian/changelog
index 6500c8b..07c1214 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-jabref (2.6~beta3+dfsg-1) UNRELEASED; urgency=low
+jabref (2.6~beta3+ds-1) UNRELEASED; urgency=low

 
   * New upstream release:
     - debian/repack.local: don't remove the three "offending" files,
       two were revomed upstream, the third was re-licensed
     - adjust debian/copyright accordingly
 
   * New upstream release:
     - debian/repack.local: don't remove the three "offending" files,
       two were revomed upstream, the third was re-licensed
     - adjust debian/copyright accordingly

+    - change version suffix to +ds since we are not repackaging for license
+      issues anymore

     - remove patches 07_PreviewPanel.patch and 08_HighlightFilter.patch,
       applied upstream
     - refresh patches 03_external_apps.patch and 06_BibtexEntry.patch
     - remove patches 07_PreviewPanel.patch and 08_HighlightFilter.patch,
       applied upstream
     - refresh patches 03_external_apps.patch and 06_BibtexEntry.patch

diff --git a/debian/copyright b/debian/copyright
index ad04f58..b86814f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ 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
 Maintainer: Morten Alver, Nizar Batada
 Source: http://jabref.sourceforge.net/
 Name: JabRef

-Disclaimer: The +dfsg version is created by removing 
- - lib/: contains sourceless pre-compiled libraries
+Disclaimer: The +ds version is created by removing lib/:
+ contains sourceless pre-compiled libraries which are not used anyway

 
 Files: *
 Copyright: 2009, Morten Alver <mortenalver@users.sourceforge.net>
 
 Files: *
 Copyright: 2009, Morten Alver <mortenalver@users.sourceforge.net>

diff --git a/debian/repack.local b/debian/repack.local
index 63d2a89..f03c114 100644 (file)
--- a/debian/repack.local
+++ b/debian/repack.local
@@ -1,2 +1,3 @@
 requires_version 2
 requires_version 2

+SUFFIX=+ds

 rm lib
 rm lib

diff --git a/debian/watch b/debian/watch
index 7bb8118..33a69ce 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 version=3

-opts="dversionmangle=s/\+dfsg$//;,uversionmangle=s/(\D)$/${1}1/;s/b(?:eta)?(\d)?$/~beta${1}/" \
+opts="dversionmangle=s/\+(dfsg|ds)$//;,uversionmangle=s/(\D)$/${1}1/;s/b(?:eta)?(\d)?$/~beta${1}/" \

        http://sf.net/jabref/JabRef-(.+)-src\.tar\.bz2 \
        debian sh debian/repack.stub
        http://sf.net/jabref/JabRef-(.+)-src\.tar\.bz2 \
        debian sh debian/repack.stub