Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c410f63..ed72354 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4488,7 +4488,7 @@ and customer address. Include units.',
     'section'     => 'addresses',
     'description' => 'The year to use in census tract lookups.  NOTE: you need to select 2012 or 2013 for Year 2010 Census tract codes.  A selection of 2011 provides Year 2000 Census tract codes.  Use the freeside-censustract-update tool if exisitng customers need to be changed.',
     'type'        => 'select',
-    'select_enum' => [ qw( 2013 2012 2011 ) ],
+    'select_enum' => [ qw( 2017 2016 2015 ) ],
   },
 
   {

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index c774dd8..7b95bb6 100755 (executable)
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -31,13 +31,6 @@ git checkout -- debian/changelog
 git pull
 #STATUS=`git pull`
 
-#Assign the proper config files for freeside-ng-selfservice
-if [ $DISTRO = "wheezy" ]; then
-       ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb7 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-else
-       ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb8 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-fi
-
 # Add the build information to changelog
 if [ $FS_REPO != "stable" ]; then
        dch -b --newversion $GIT_VERSION-$DATE "Auto-Build"

diff --git a/debian/freeside-ng-selfservice.conffiles b/debian/freeside-ng-selfservice.conffiles
new file mode 100644 (file)
index 0000000..d6537dd
--- /dev/null
+++ b/debian/freeside-ng-selfservice.conffiles
@@ -0,0 +1 @@
+/var/www/html/ng_selfservice-DIST/freeside.class.php

diff --git a/debian/freeside-ng-selfservice.deb7 b/debian/freeside-ng-selfservice.deb7
deleted file mode 100644 (file)
index 58f0d3a..0000000
--- a/debian/freeside-ng-selfservice.deb7
+++ /dev/null
@@ -1 +0,0 @@
-/var/www/ng_selfservice-DIST/freeside.class.php

diff --git a/debian/freeside-ng-selfservice.deb8 b/debian/freeside-ng-selfservice.deb8
deleted file mode 100644 (file)
index d6537dd..0000000
--- a/debian/freeside-ng-selfservice.deb8
+++ /dev/null
@@ -1 +0,0 @@
-/var/www/html/ng_selfservice-DIST/freeside.class.php